Frederik Rietdijk
6ad79678d4
Merge remote-tracking branch 'upstream/master' into HEAD
2017-11-23 16:38:31 +01:00
Graham Christensen
8443352ffa
Merge pull request #31973 from grahamc/options-fix-inginious
...
inginious: fix options eval
2017-11-23 09:43:23 -05:00
Graham Christensen
2bbdd70b99
inginious: fix options eval
2017-11-23 09:33:59 -05:00
Jörg Thalheim
487c4a6f6e
Merge pull request #27513 from lukeadams/prl-tools-fix
...
[NixOS] Fix + update `hardware.parallels` config option
2017-11-23 14:10:21 +00:00
Jörg Thalheim
d541d0c7bf
Merge pull request #31941 from Rovanion/master
...
user-mgmt.xml: extraUsers => users
2017-11-23 10:28:47 +00:00
Rovanion Luckey
99864c4a79
nixos/manual: extraUsers -> users in user-mgmt.xml
...
Changed extraUsers -> users and one case of extraGroups -> groups in nixos manual chapter 7.
According to chatter on IRC these are the proper names for these configuration options nowadays.
Modified based on feedback from Jörg Talheim.
2017-11-23 10:22:00 +01:00
Profpatsch
f09f49d483
nixos/doc/manual: print context on failing xmllint validation
...
Previously only the line numbers of a giant, internally generated XML file were
printed, without any kind of debuggability.
Now at least the mentioned lines are printed with a little bit of surrounding
context (to have something to grep for).
```
manual-combined.xml:4863: element para: Relax-NG validity error : Did not expect element para there
4859 <chapter xmlns="http://docbook.org/ns/docbook " xmlns:xlink="http://www.w3.org/1999/xlink " xmlns:xi="http://www.w3.org/2001/XInclude " version="5.0" xml:id="sec-writing-modules">
4860
4861 <title>Writing NixOS Modules</title>
4862
4863 <para>NixOS has a modular system for declarative configuration. This
4864 system combines multiple <emphasis>modules</emphasis> to produce the
4865 full system configuration. One of the modules that constitute the
```
2017-11-22 21:27:05 +01:00
Domen Kožar
ad492e6f33
hydra: 2017-10-26 -> 2017-11-21
2017-11-22 17:24:55 +00:00
Thomas Strobel
67ce1357fa
nixos: init module: restya-board
2017-11-22 12:14:24 +01:00
Thomas Strobel
2128d8ce4e
ixos ids: reserve restya-board
2017-11-22 12:14:24 +01:00
Joachim F
1f2b938734
Merge pull request #31850 from herrwiese/evilwm
...
evilwm: implement NixOS WM module
2017-11-21 22:56:22 +00:00
Orivej Desh
b8e1e7191e
Merge branch 'master' into staging
...
* master: (80 commits)
lkl: Supports aarch64
wimlib: nitpicks
gitAndTools.git-codeowners: 0.1.1 -> 0.1.2
wimlib: init at 1.12.0
kernel: improve modDirVersion error message
releaseTools.sourceTarball: Clean up temporary files
dotnetPackages.SmartIrc4net: rehash source
migmix: make it a fixed-output derivation
vm: Create /dev/full
samba: 4.6.8 -> 4.6.11 to address CVEs CVE-2017-14746 & CVE-2017-15275
microcodeIntel: 20170707 -> 20171117
sshd: Remove ripemd160 MACs
kernel config: Enable MEDIA_CONTROLLER
linux: 4.4.99 -> 4.4.100
linux: 4.9.63 -> 4.9.64
nix-bash-completions: 0.4 -> 0.5
linux: 4.14 -> 4.14.1
linux: 4.13.14 -> 4.13.15
nix-zsh-completions: 0.3.3 -> 0.3.5
dns-root-data: use a stable URL that I maintain anyway
...
2017-11-21 22:48:36 +00:00
Tim Steinbach
48252b15b9
sshd: Remove ripemd160 MACs
...
They are invalid for our OpenSSH
2017-11-21 09:36:51 -05:00
Graham Christensen
3c9b356e10
Merge pull request #31860 from rycee/nixos/bash/fix/inputrc
...
nixos/bash: mark `inputrc` etc file as default
2017-11-20 21:46:54 -05:00
Tim Steinbach
861fef71f4
Merge pull request #31763 from jeaye/harden-ssh-config
...
Harden ssh config defaults and remove old host key support
2017-11-20 20:13:21 +00:00
Robert Helgesson
101d56cb0c
nixos/bash: mark inputrc
etc file as default
...
The bash module currently sets the `/etc/inputrc` unconditionally,
which prevents easy user override. This commit lowers the priority of
the setting to "option default" level, which allows a user to override
the value using either
environment.etc."inputrc".text = …
or
environment.etc."inputrc".source = …
2017-11-20 12:32:01 +01:00
Orivej Desh
ab0d141f44
Merge branch 'master' into staging
...
* master: (23 commits)
silver-searcher: patch bash completions location
shairplay: init at 2016-01-01
ocamlPackages.rope: 0.5 -> 0.6
ocamlPackages.ocaml_gettext: 0.8.7 -> 0.8.8
mupdf: Patch openjpeg version
nextcloud-client: fix build after qt updates
gstreamer.gst-plugins-bad: Patch openjpeg version
silver-searcher: move bash completion to etc/bash-completion.d/
neomutt: use mime.types from dedicated mime-types derivation
mime_types: rename to mime-types
XMLLibXML: 2.0129 -> 2.0132 fixes failing tests & CVE-2017-10672
nixos/matrix-synapse: remove unused log_file config
nixos: run parted with --script option (3rd)
nixos: run parted with --script option (2nd)
nixos/release: add nixos/tests/switch-test.nix to tested job
nixos/system: make switch-to-configuration script pure.
nixos/release: include mutableUsers test to release tests.
nixos/tests: Add a test for config.users.mutableUsers.
corebird: 1.7.2 -> 1.7.3
nixos/matrix-synapse: make home directory configurable
...
2017-11-20 09:21:51 +00:00
Franz Pletz
0ed7d4d0e8
Merge pull request #31812 from eqyiel/matrix-synapse-configurable-home
...
nixos/matrix-synapse: make home directory configurable
2017-11-20 09:35:57 +01:00
Andreas Wiese
f5f601a7f2
nixos/evilwm: allow enabling evilwm through services.xserver.windowManager.evilwm.*
2017-11-20 07:50:28 +01:00
Ruben Maher
50777e5702
nixos/matrix-synapse: remove unused log_file config
2017-11-20 09:29:45 +10:30
Bjørn Forsman
aedba5c2af
nixos: run parted with --script option (3rd)
...
Doh, should have included this in previous commit.
Ref. 0ff4bb5f87
("nixos: run parted with --script option").
2017-11-19 22:55:12 +01:00
Bjørn Forsman
bf338ab9ee
nixos: run parted with --script option (2nd)
...
Ref. 0ff4bb5f87
("nixos: run parted with --script option")
2017-11-19 22:50:24 +01:00
Franz Pletz
bdbaaad7de
Merge pull request #29269 from Moredread/test_crypt_with_keyfile
...
Test opening encrypted filesystem with keyfile
2017-11-19 20:30:59 +01:00
obadz
edcf51a359
Merge pull request #31805 from gleber/make-switch-to-configuration-pure
...
nixos/system: make switch-to-configuration script pure
2017-11-19 19:03:52 +00:00
Franz Pletz
f367bb4d6d
Merge pull request #31569 from gleber/add-mutable-users-test
...
nixos/tests: add a test for config.users.mutableUsers.
2017-11-19 19:54:28 +01:00
Gleb Peregud
f8fb6a679e
nixos/release: add nixos/tests/switch-test.nix to tested job
2017-11-19 19:50:08 +01:00
Gleb Peregud
2f6148c743
nixos/system: make switch-to-configuration script pure.
...
Fixes #28443
Fixed few invocations to `systemctl` to have an absolute path. Additionally add
LOCALE_ARCHIVE so that perl stops spewing warning messages.
2017-11-19 19:42:54 +01:00
Franz Pletz
fa824e6c58
Merge branch 'master' into staging
2017-11-19 19:39:04 +01:00
Pierre Chevalier
c46d4dab96
gdm: remove old workaround for conflicts with getty
...
- There used to be a conflict between gdm and getty both trying to
access tty1
- This conflict was fixed by running gdm on tty7 instead
2017-11-19 19:35:37 +01:00
Pierre Chevalier
aed114ecb9
Revert "gdm: don't start getty@tty1 if enabled"
...
This commit isn't needed anymore since we now run gdm on tty7.
This reverts commit 440178d729
.
2017-11-19 19:35:37 +01:00
Gleb Peregud
cea8302182
nixos/release: include mutableUsers test to release tests.
2017-11-19 19:20:50 +01:00
Gleb Peregud
1dd0379ba8
nixos/tests: Add a test for config.users.mutableUsers.
...
It's in preparation to add an assertion for #4990 .
2017-11-19 19:11:19 +01:00
Franz Pletz
71b8437e2c
nixos/tests: add couchdb test
2017-11-19 17:39:36 +01:00
Orivej Desh
50d8720d2a
nixos/testing: fix after --set ceased to evaluate the value
2017-11-19 14:15:19 +00:00
Ruben Maher
86e161ff47
nixos/matrix-synapse: make home directory configurable
2017-11-19 13:48:29 +10:30
jeaye
03f7adfdd1
nixos/ssh: Update 18.03 release notes
...
Since ssh-dss is no longer supported by default, users relying on those
keys for their login may be locked out. They should ideally use stronger
keys, but adding the support for ssh-dss back in can also be done
through extraConfig.
2017-11-18 15:35:56 -08:00
Pierre Chevalier
b3de3893d0
nixos/zsh: add the type for enableAutosuggestions option
...
Simply a small inconsistency I picked up when reading that file.
fixes #31795
2017-11-18 21:27:12 +00:00
Tuomas Tynkkynen
931aa5f9e2
U-Boot: 2017.03 -> 2017.11
...
Also move patches from sd-image-aarch64.nix, they might be useful for
the older raspberries as well.
2017-11-18 13:57:17 +02:00
Orivej Desh
89912165e1
Merge pull request #31378 from michaelpj/imp/plymouth-nixos-branding
...
breeze-plymouth: add optional nixos branding, enable for plasma5
2017-11-18 10:37:26 +00:00
Michael Peyton Jones
eec4c31d89
plasma5: enable NixOS branding in plymouth theme
2017-11-18 10:36:23 +00:00
Bjørn Forsman
3f36f167e6
nixos/pam: fix docs about path to u2f_keys file
...
Looking at upstream git repo (git://github.com/Yubico/pam-u2f.git) the
docs initially said the path was ~/.yubico/u2f_keys, but it was later
changed to ~/.config/Yubico/u2f_keys (in 2015).
I have run pam_u2f.so with "debug" option and observed that the correct
path indeed is ~/.config/Yubico/u2f_keys.
2017-11-17 17:50:40 +01:00
Franz Pletz
00056e76d0
nixos/tests/acme: update terms of service to fix test
2017-11-17 16:05:13 +01:00
Oliver Charles
560400773c
nixos/prometheus: Correct documentation for external_labels
...
As description is literal XML, I need to escape < and > by hand.
2017-11-17 11:06:03 +00:00
Oliver Charles
acb7f43db9
nixos/prometheus: add external_labels option
2017-11-17 10:16:21 +00:00
Oliver Charles
f0334c0336
nixos/prometheus: add scrape_configs.honor_labels
2017-11-17 10:15:37 +00:00
jeaye
2a8bd9e2a1
nixos/ssh: Harden config defaults
2017-11-16 20:25:37 -08:00
jeaye
ec80c92825
nixos/ssh: Remove support for old host keys
2017-11-16 20:25:22 -08:00
Orivej Desh
963204e6ee
Merge pull request #31753 from mbld/show-ip
...
nixos-container: Make show-ip work together with ipv4 + netmask
2017-11-17 00:32:56 +00:00
Orivej Desh
f79e3e237f
Merge pull request #31618 from adisbladis/zfs-tests
...
Add basic ZFS tests
2017-11-16 20:00:16 +00:00
Martin Bornhold
25b71e18f5
nixos-container: Modify existing test to cover show-ip command
...
Modified the existing test to check that the 'nixos-container show-ip' command
can handle ipv4 addresses with submask in CIDR notation.
2017-11-16 20:25:45 +01:00