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
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
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
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
Parnell Springmeyer
cb11bf73a5
nixos/nghttpx: add module for the nghttpx proxy server ( #31680 )
...
* nghttpx: Add a new NixOS module for the nghttpx proxy server
This change also adds a global `uid` and `gid` for a `nghttpx` user
and group as well as an integration test.
* nixos/nghttpx: fix building manual
2017-11-16 18:21:02 +00:00
Franz Pletz
903a7e2f94
Merge pull request #31641 from danbst/patch-13
...
mysql module: fix flaky check
2017-11-16 00:07:55 +01:00
Tim Steinbach
c9b8bbd039
Merge pull request #31268 from Ma27/x11-defaults
...
services.xserver: fix defaults of X11
2017-11-15 16:41:52 +00:00
Thomas Tuegel
dd5e6bcefc
Merge pull request #31504 from benley/fontconfig-localconf
...
fonts: fix fontconfig.localConf when used with penultimate
2017-11-15 08:23:47 -06:00
Jan Tojnar
a3509f6c22
gnome3.gnome-online-miners: add missing dleyna dependency
2017-11-15 14:02:37 +01:00
Jan Tojnar
e1b8636181
dleyna-server: init at 0.6.0
2017-11-15 14:02:37 +01:00
Jan Tojnar
abb17136de
gnome3.gnome-photos: add missing dleyna depenency
2017-11-15 14:02:37 +01:00
Jan Tojnar
a04cfdea12
dleyna-renderer: init at 0.6.0
2017-11-15 14:02:37 +01:00
Maximilian Bosch
20a5e9db84
nixos-option: don't eval description
...
see https://github.com/NixOS/nixpkgs/pull/31630#issuecomment-344073438
2017-11-14 23:06:44 +01:00
Robin Gloster
9181faac41
dovecot: fix config if mailboxes == []
2017-11-14 16:49:53 +01:00
Franz Pletz
775fb7e127
Merge pull request #31616 from jerith666/smartd-cat
...
smartd: fix 'cat: command not found' error
2017-11-14 12:32:23 +01:00
Franz Pletz
06d0ba1ee9
Merge pull request #31477 from andir/fix-babeld-config
...
Fix babeld config
2017-11-14 12:12:59 +01:00
Franz Pletz
d43b55c1e3
Merge pull request #31545 from rnhmjoj/wireless
...
docs: document networking.wireless changes
2017-11-14 12:04:26 +01:00
Tuomas Tynkkynen
cbccb1edf5
nixos installer tests: Add UEFI Grub test
...
Fixed merge conflict. Closes #22923 .
2017-11-14 11:30:28 +01:00
adisbladis
59e4599723
Add basic ZFS tests
2017-11-14 14:34:19 +08:00
aszlig
f6ae3948bc
tests/boot-stage1: Fix build of kcanary module
...
In bfe9c928c1
the default kernel has been
updated to version 4.14 and the declarations for allow_signal() and
signal_pending() are no longer exposed via kthread.h, so let's actually
use the right header files.
I've added a condition for kernel 4.10 and upwards to include the
linux/sched/signal.h header file, because that got introduced in version
4.10. Even if the declaration would still reside in kthread.h (I haven't
checked) for version 4.10 it won't hurt and the compilation will still
succeed.
Tested against kernel 4.9 and 4.14 and the build now succeeds.
Signed-off-by: aszlig <aszlig@nix.build>
2017-11-14 04:36:19 +01:00
Danylo Hlynskyi
9f7315caf2
mysql module: fix flaky check
...
Comparing packages via equality will lead to different results when package and module are from different
`nixpkgs` checkouts.
Also, because MariaDB is actually supported, added a note to option description to make this knowledge more discover-able.
2017-11-14 03:08:15 +02:00
Graham Christensen
9a4b2de497
Merge pull request #31630 from Ma27/fix-postgres-quoting
...
services.postgres: fix quoting in the description of `superUser`
2017-11-13 17:01:05 -05:00
Maximilian Bosch
82062f7080
services.postgres: fix quoting in the description of superUser
...
`nixos-option` evals the description and the '`' is used to
define shell commands.
Due to this, the following error appears:
```
$ nixos-option services.postgresql.superUser
Value:
"root"
Default:
"root"
Description:
/run/current-system/sw/bin/nixos-option: line 294: root: command not found
/run/current-system/sw/bin/nixos-option: line 294: postgres: command not found
NixOS traditionally used as superuser, most other distros use .
From 17.09 we also try to follow this standard. Internal since changing this value
would lead to breakage while setting up databases.
```
2017-11-13 22:22:35 +01:00
Orivej Desh
b62ad4f22b
Merge pull request #31526 from srhb/fix-php-external-pcre
...
php: Fix php pcre by using external lib
2017-11-13 20:15:37 +00:00
Tom Smeets
81295c479d
fractalart service: init, Generate wallpapers ( #23231 )
...
* Add a service for generating wallpapers
This service will generate a new wallpaper using the "FractalArt" haskell package.
2017-11-13 19:56:08 +01:00
Matt McHenry
292715ce23
smartd: fix 'cat: command not found' error
2017-11-13 12:52:24 -05:00
Orivej Desh
470a7752d8
make-disk-image: fix eval
2017-11-13 14:56:30 +00:00
Samuel Leathers
e0483a59cc
Merge pull request #31532 from romildo/upd.enlightenment
...
enlightenment: 0.21.10 -> 0.22.0
2017-11-12 21:44:54 -05:00
José Romildo Malaquias
c42a0fbf09
enlightenment: 0.21.10 -> 0.22.0
...
- Update to version 0.22.0
- Switch build tools from autotools to meson
- Change handling of setuid programs
2017-11-13 00:22:01 -02:00
Orivej Desh
27f5cc959b
make-disk-image: embed compression switch into the format name
2017-11-12 18:39:36 +00:00
Orivej Desh
608de48fe4
make-disk-image: add compressed option to compress qcow2 images
2017-11-12 18:28:06 +00:00
Orivej Desh
a2d3ee77b8
make-disk-image: clean up
2017-11-12 18:24:26 +00:00
Orivej Desh
f7bb8d2dfa
Merge pull request #31537 from orivej/lkl
...
lkl: 2017-10-18 -> 2017-11-10, make-disk-image: do not fake time for cptofs
2017-11-12 18:09:34 +00:00
Sarah Brofeldt
88195b9863
php: pcre test blocks -small channels as well
2017-11-12 11:03:54 +01:00
Sarah Brofeldt
58d07e2d6b
php: Add nixos test to ensure php-pcre works in httpd
2017-11-12 08:05:27 +01:00
rnhmjoj
ebbe165860
docs: document networking.wireless changes
2017-11-12 00:39:17 +01:00
rnhmjoj
2918f6a3f0
nixos/wireless: add manual network configuration
2017-11-11 23:11:46 +01:00