Commit Graph

9679 Commits (release-18.03-flake)

Author SHA1 Message Date
Franz Pletz ca6b64ae7b
nixos/version: fix nixops pre 1.6 compatibility
We should be able to deploy a NixOS 18.03 system with the current nixops
stable release. Some options were renamed, so instead of
`mkRenamedOptionModule` we introduce them as read-only interal options
that won't be rendered in the manual.

Only the options that are needed to make nixops evaluations succeed were
added.

This commit should probably be reverted after or before the 18.09 release,
depending on the nixops 1.6 release.

The user will not get the warning that these have been renamed but
this change is mentioned in the release notes.

Fixes #34253.

(cherry picked from commit 70c6f6572dda0f2516bad812857ef814ec710a12)
2018-04-04 00:10:21 +02:00
Matthieu Coudron d5c26dd063 qemu-vm: passing QEMU_NET_OPTS would fail
because of a change in #36850.
spotted by @jtojnar b7a2333ebe (commitcomment-28134992)

(cherry picked from commit 33b0ad83e976ed6bb22b6862ca0637dd2fb765f7)
2018-04-03 17:57:17 +02:00
Tuomas Tynkkynen 43f1db5b0d nixos/sd-image-*: Raspberry Pi firmware no longer falls under unfree
It's just unfreeRedistributableFirmware now.

(cherry picked from commit 1e5cb384d5bced16f31fd60c60c9583cf027738f)
2018-04-03 00:13:17 +03:00
Tuomas Tynkkynen c51459026a nixos/release.nix: Add Hydra job for AArch64 SD image
Based on how ISO images are added to the release.

(cherry picked from commit 181e0675da948927f63a8bc45d1a8f4116f49d5d)
2018-04-03 00:12:53 +03:00
Tuomas Tynkkynen ac447b0524 nixos/sd-image: Make it more similar to iso-image.nix
- Add `imageName` and `imageBaseName` options similar to the `isoName`
  and `isoBaseName` options
- Make the filename of the iso match what iso-image.nix does
- Generate a nix-support/hydra-build-products like iso-image.nix does

(cherry picked from commit 4c21180a1303fdafa556fb83d9b6839b2eeb0616)
2018-04-03 00:12:18 +03:00
Nikolay Amiantov 47caeb1272 nodePackages.parsoid: pin service-runner to 2.3.0
service-runner had a backwards incompatible update, and parsoid 0.9.0
doesn't work with current stable MediaWiki. Instead use as a source
a repository with 0.8.0 and pinned service-runner version.

(cherry picked from commit 37546be90070173d96e2ffb7080447f23c93df68)
2018-04-02 22:43:02 +03:00
Vladimír Čunát b2bc3db8f5
Revert "systemd: 237 -> 238"
This reverts commit 2d2ab94cd2.
2018-04-02 12:10:54 +02:00
Vladimír Čunát a6d00d0d8f
nixos.tests.containers-imperative: fix impurity failure
I can't claim to fully understand this, but the change seems safe,
and it fixes the test on my machine.

(cherry picked from commit 75e4d3f2f0dd258c296e77b827dfe934472e187f)
2018-04-02 11:43:02 +02:00
Franz Pletz 27974ed369
nixos/unbound: don't fail on root trust anchor updates
Exit code on updates is 1 which makes the inital start of unbound fail.

(cherry picked from commit 35f474d61d8ed34aec8bb72ffc7e7b6d27bbd712)
2018-04-01 23:57:43 +02:00
Joachim Schiele 0a224fe280
user/group assertion to not exceed the 32 character limit
(cherry picked from commit 1b0cb040d9e44910edf8496f517d42c3878e9af2)
(original PR: #36556)
2018-03-31 14:29:14 +02:00
Franz Pletz 69a03de038 nixos/dovecot: set group in config
The dovecot bump to 2.3.1 caused the dovecot service to fail to start
because it would try to chgrp sockets to dovecot whereas our default
dovecot group is called dovecot2.

(cherry picked from commit 6a15c8d6f7b339a542b0f8f25c12a2d6d1969715)
2018-03-29 21:39:22 +02:00
Robin Gloster c30303e038
gitlab: disable
The last rubygems update broke this

(cherry picked from commit 68c4605f1a251b97cb0fcde251ce52d498e2cef8)
2018-03-29 19:18:45 +02:00
Maximilian Bosch 78e13f5da2 Revert restrictive validation behavior for DM/WM defaults in the X module
The original idea behind this change (described in ticket #11064) was to
improve the assertions to avoid that users of the X server accidentally
forget to configure a DM or WM.

However this caused several issues with setups that require X, but no DM
or WM. The keymap testcases became instable as well as now disabling DMs
needs to be done explicitly.
(see https://github.com/NixOS/nixpkgs/pull/31268#issuecomment-347080036)

In the end the idea behind the change and #11064 was obviously a
mistake, so reverting it completely for now should be fine.

(cherry picked from commit 5caa22fe0a908ede1889d32fa773b9aef675a56e)
2018-03-28 20:34:40 +02:00
xeji 255f999541
nixos/tests/atd : remove test of batch command
"batch" executes jobs based on system load.
test was not deterministic.

(cherry picked from commit b08560fb0abcca6f2c704d1d0664e3cd17580172)
2018-03-28 08:44:33 +02:00
Justin Humm be798556eb
apache-httpd: fix typo in config servedFiles
(cherry picked from commit 169468c40681b551ac906dfe68db338c56661c2e)
2018-03-28 08:43:08 +02:00
Nikolay Amiantov d2b6e655ca linuxPackages.nvidia_x11_legacy173: drop
There's no kernel in nixpkgs suitable for this old driver -- tested with 4.4.

(cherry picked from commit 25ac79647cea487127c071f4ae9742e0bc70aab2)
2018-03-27 16:54:35 +03:00
Michael Raskin 741ae94dc0 Merge pull request #35073 from Infinisil/fix/znapzend
nixos/znapzend: fix when no previous zetup

(cherry picked from commit 296dca019bbcd4160e3a6cb3a82bbe6bebae9bbf)
2018-03-25 19:42:25 +02:00
Tuomas Tynkkynen ad027421c3 nixos/tests/misc: Fix on aarch64
The psmouse module is for PS/2 mouse only, which doesn't exist outside
x86. But we can test for the mousedev module just as well which is used
for the '-device usb-tablet' emulated by QEMU.

(cherry picked from commit d27f7942b7ab745c5a00a993e2316c46654117d1)
2018-03-25 18:38:57 +03:00
Tim Steinbach e2b8732980
vault: Fix test
(cherry picked from commit 3aa3738bb2582f9142675c952f7e6e3621081c1e)
2018-03-25 01:01:34 +01:00
Tuomas Tynkkynen be44525d04 nixos/tests/installer: Give eval failure on unsupported boot methods
(cherry picked from commit 3131daace1eed2b642ab56c5843fd2057fbbfde3)
2018-03-24 18:37:20 +02:00
Tuomas Tynkkynen f45bc2b3e4 nixos/tests: Make simpleUefiGrub test work on AArch64
Needs more refactoring for the AArch64 '-enable-kvm' stuff some day...

(cherry picked from commit e58624a877342d1fea39b02a5d6528cd53eefefe)
2018-03-24 16:51:06 +02:00
Matthew Justin Bauer f61244da2e
Merge #33685: amdgpu-pro: 17.10 -> 17.40
(cherry picked from commit ce01740daeaf1288cc973942d80ed8bf69e9d1d1)
> It's definitely less broken than 17.10.
2018-03-24 12:57:47 +01:00
Jörg Thalheim 08101d052d
Merge pull request #37714 from flokli/nuke-networkmanager-pptp-18.03
networkmanager-pptp: remove package (18.03)
2018-03-23 22:58:21 +00:00
Florian Klink fb4847ebdd networkmanager-pptp: remove package
backport of #37712

Currently broken on NixOS due to hardcoded modprobe binary path (see
bug #30756 from Oct 2017), no activity on a proposed fix for months.
As the protocol is terribly broken anyways, let's better remove it
completely, and not talk about anymore ;-)

Closes #30756.

(cherry picked from commit 6ac74d60ad5c8f535ab535a13d8c365dddc6c401)
2018-03-23 23:16:09 +01:00
Nikolay Amiantov 2d2ab94cd2
systemd: 237 -> 238
(cherry picked from commit 0ccab4946d5d0405ebced50a7b7f847730d502a9)
2018-03-22 23:12:42 +01:00
WilliButz b828d00ffd
nixos/prometheus-exporters: add postfix exporter & documentation
(cherry picked from commit c54aa1f2939afeb5d8e32a6f1bba387f6b79ffc2)
2018-03-22 15:24:55 +01:00
WilliButz 135e13f8fc
release notes: add information about prometheus exporters
(cherry picked from commit 8a1310122679b1d646a2c753e869f448f6b99796)
2018-03-22 15:24:55 +01:00
WilliButz 55e97a2ebb
nixos/prometheus-exporters: rewrite and restructure
- prometheus exporters are now configured with
  `services.prometheus.exporters.<name>`
- the exporters are now defined by attribute sets
  from which the options for each exporter are generated
- most of the exporter definitions are used unchanged,
  except for some changes that should't have any impact
  on the functionality.

(cherry picked from commit f4d03b5c9cf2b694792dec88e3ca805cf7b43e3c)
2018-03-22 15:24:55 +01:00
Robin Gloster ba11500aa8
prosody: add test to release.nix
(cherry picked from commit faaf32a0ee3ed3693e87def1fabd6b8a89e29a41)
2018-03-22 14:33:10 +01:00
Robin Gloster 766a80ec84
prosody: improve module handling
(cherry picked from commit 0a80f2c0f4284428235b0f54e228f6e76f1673a7)
2018-03-22 14:33:10 +01:00
Florian Jacob b9084d0160
nixos/prosody: add a basic test
(cherry picked from commit 88f06c5ce9800d661fa85c019838fe67635aa64f)
2018-03-22 14:33:09 +01:00
Florian Jacob 7ef13f58b6
prosody: 0.9.12 -> 0.10.0
updating config options, removing luazlib as mod_compression was removed
for security reasons.

(cherry picked from commit 226965da67c25bbad0c6c0cc6d21b64a647beed8)
2018-03-22 14:33:09 +01:00
Robin Gloster 103e2c4efb
graylog: use jre_headless
(cherry picked from commit fa347164b607df52768fd952d56bd42a90fc9a6a)
2018-03-22 02:32:43 +01:00
Franz Pletz eb80bdc402
gitlab service: use recommended unicorn config
(cherry picked from commit e5a854e740ba2963af85a242229a8a8f3c250136)
2018-03-22 02:32:27 +01:00
Simon Lackerbauer d6595b4d5b
gitlab: 10.3.4 -> 10.5.4
(cherry picked from commit 1b559058064992e5d8cd951f42232793aa99d960)
2018-03-22 02:32:27 +01:00
Robin Gloster 75842fe98c
gitlab-shell: fix config path finding
and remove TimeoutSec for gitlab

(cherry picked from commit 31d77fd4f3d009631e0dc4361bfc0648fadcce4a)
2018-03-22 02:32:26 +01:00
John Ericson 192f4144b2 release-lib: Filter supportedSystems with `meta.platforms`-style patterns
Instead of intersecting system strings, we filter with the sort of
patterns used in `meta.platforms`.

Indicating this change `forTheseSystems` has been renamed to
`forMatchingSystems`, since the given list is now patterns to match, and
not the systems themselves. [Just as with `meta.platforms`, systems
strings are also supported for backwards compatibility.]

This is more flexible, and makes the `forMatchingSystems` and
packagePlatforms` cases more analogous.
2018-03-19 21:32:28 -04:00
Robert Schütz 7a5c7c1818 nixos/borgbackup: init
(cherry picked from commit fdf0f037be55c5c14e24667b1ad7eeedf2057295)
2018-03-19 20:32:43 +01:00
WilliButz 280d762338
grafana: 5.0.1 -> 5.0.3, fix headless phantomjs
(cherry picked from commit ca7b29050fed6283c701148e8135b01d61328379)
2018-03-19 20:00:45 +01:00
Peter Hoeg 6e30c6b265 nixos home-assistant: a couple of fixes (#36338)
a) set path to /run/wrappers so ping works
b) run via a target so we can easily inject other components (config copier,
appdaemon)

(cherry picked from commit 2859483fe952adf3fca90ae6615fec90ef955b4f)
2018-03-18 23:43:24 +08:00
giraffito 0869801a69 nixos/security: fix description of sudo.wheelNeedsPassword
the previous description mistakenly described the opposite semantics

(cherry picked from commit b9639d7e1f2fac0b21d47db2d16683ae9f58b70c)
2018-03-18 12:29:00 +00:00
Andreas Wiese fce096accc nixos/window-managers: actually add evilwm to default.nix
Commit 1f2b938 introduced a module for evilwm as a window-manager, but
did not actually add this module to window-manager's default.nix which
renders it useless.

(cherry picked from commit c7e1dff94e1f1c60d6d3b01a41f3fda874bbcf9a)
2018-03-18 11:13:53 +00:00
Elis Hirwing 280ac9b471 gitea: fix usage over ssh
Using gitea over ssh had two isses:
 1. No shell was set for the user
 2. Gitea tried to write logs to
 /nix/store/x83q12kyd9gw1pay036dxz2dq0apf17h-gitea-1.3.2-bin/log when
 serving the ssh usage.

(cherry picked from commit fa76c9a38554731933d53a41e741266f43f617d0)
2018-03-18 09:42:23 +00:00
Corey O'Connor d64af3e40f jenkins: Add "java.awt.headless=true" to JDK options.
This is consistent with the recommended jenkins startup script. See:

* https://wiki.jenkins.io/display/JENKINS/JenkinsLinuxStartupScript

(cherry picked from commit 28a55f5bd60c5f21139de58ee01eb90e25b20b9d)
2018-03-18 08:54:39 +00:00
Corey O'Connor 83e6969c44 jenkins: Include Deja-Vu fonts in system environment to silence jenkins warning.
(cherry picked from commit 241160aacc8433de07b5d71be98e3c3b677c0533)
2018-03-18 08:54:34 +00:00
Richard Marko 4937ce0100 nixos manual: fix (n)of typo
(cherry picked from commit d5de7bbc920560331bd1ba951a182c2dbe0e8462)
2018-03-18 08:35:45 +00:00
Elis Hirwing 812b2196fc
gitea: enable and configure postgres service if selected as database
(cherry picked from commit 1ad75d0c501fb757c7bceb346efe130bad48db1f)
2018-03-15 14:04:09 -04:00
Tuomas Tynkkynen b26595f873 nixos/qemu-vm: Add virtualized display + HID devices on AArch64
(cherry picked from commit 9e78baf5c75ed87360dfcab4c5eeeee2256be2dc)
2018-03-14 21:55:32 +02:00
aszlig b05df747cb
nixos/tests/virtualbox: Work around test failures
I've started digging into the actual cause of the problem a week ago but
didn't continue fixing this.

The reason why the tests are failing is because
torvalds/linux/commit/72f5e08dbba2d01aa90b592cf76c378ea233b00b has
remapped the location of the TSS into the CPU entry area and we did
update our default kernel to version 4.14 in NixOS/nixpkgs@88530e02b6.

Back to VirtualBox: The guru meditation happens in
selmRCGuestTssPostWriteCheck, which I think is only a followup error. I
believe the right location couldn't be determined by VirtualBox and thus
the write check function triggers that panic because it's reading from
the wrong location.

So the actual problem *only* surfaces whenever we use software
virtualization, which we do for our tests because we don't have nested
virtualization available.

Our tests are also for testing the functionality of VirtualBox itself
and not certain kernel versions or kernel features, so for the time
being and until this is fixed, let's actually use kernel version 4.9 for
the guests within the VM tests. Kernel 4.9 didn't have the mentioned
change of the TSS location and thus the tests succeed.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @dtzWill
(cherry picked from commit ba816ee08721d0c2f5f7e6652091bed085ac7687)
2018-03-13 22:01:22 +01:00
Matthieu Coudron 075908d34b
grub-install.pl: more details on blkid failure
(cherry picked from commit c476d2f592f5fc4ccca10da4d8f45c7d15eb8c5a)
2018-03-13 15:02:05 +01:00
Matthieu Coudron 3264fe594d
build-vm: remove trailing dot from script path
Allow to double click/middle click paste path a bit quicker.

(cherry picked from commit 7b7860ff8958efa70d164f2e8d7477fb6aadfe39)
2018-03-13 15:02:05 +01:00
Matthieu Coudron 2c8a6a879c
qemu-vm: removes warning when running build-vm
get rid of deprecated qemu commands

(cherry picked from commit b7a2333ebe7a0916c9791f3b7a839e8095c39f7f)
2018-03-13 15:02:05 +01:00
Antoine Eiche 763ec32dd7
tests/docker-tools: add onTopOfPulledImage test
(cherry picked from commit bc1e8f95d4c20c996ca14f39331fe23cbb3ffe2c)
2018-03-13 15:02:04 +01:00
WilliButz 442da8b898
grafana: 5.0.0 -> 5.0.1
(cherry picked from commit ef90ff2d8ea13ebf222eb437fb6db8fcbbc1a554)
2018-03-13 00:39:44 +01:00
Franz Pletz a3d87f1ed8
nixos/tests/containers-tmpfs: fix test name
(cherry picked from commit b0fa004fa9247a15c31f4f986791c025f9242c3d)
2018-03-12 22:28:51 +01:00
Sarah Brofeldt 9dbc763949
nixos/tests/acme: use mail-test-srv tls certs from source
(cherry picked from commit df3706c47cbdea7d69b82a7ba857d58f3d4ea51f)
2018-03-12 22:10:20 +01:00
Sarah Brofeldt 665c75eccb
nixos/tests/acme: go compat update, unvendor pkcs11
(cherry picked from commit bd3558086088e36a93590947ce68dc9dad274b8d)
2018-03-12 22:10:20 +01:00
Silvan Mosberger 313dab0c3f resilio: Adjust option description to 3d17573
(cherry picked from commit 86ca617948127236dfb38f6459a6e4926d11dee5)
2018-03-12 11:05:27 +00:00
Silvan Mosberger c536d4030b nixos/network-interfaces: Fix 2 small typos
(cherry picked from commit 08704aa2f71f1d368a0370efeba411a4a8cdeda2)
2018-03-10 15:56:16 +00:00
Vladimír Čunát d9f179252d
WIP:
waiting for https://github.com/NixOS/nixos-org-configurations/pull/39
2018-03-09 20:49:56 +01:00
Matthew Bauer 02a0fb8e74 demo: autologin through xserver
also disable upower on virtualbox
Fixes #36348
2018-03-09 11:37:11 +00:00
Daiderd Jordan a4340341a6
nixos: inline set-environment for bash and zsh
(cherry picked from commit b00a3fc6fd82834114771f2115a2b032f0ebfe29)
2018-03-08 21:07:40 +01:00
Vladimír Čunát 82bb0a18f0
nixos release: more evaluation fixes
... if missing x86 in supportedSystems

(cherry picked from commit eab479a5f0e46ad461ebda9953477be8f1e5e2bb)
2018-03-07 17:32:56 +01:00
Vladimír Čunát aa84b58f00
nixos/release: fix evaluation if missing x86
... in supportedSystems

(cherry picked from commit e59b91bc9a07c643f365cc084850af5a2c2cc04f)
2018-03-07 16:07:02 +01:00
Nikolay Amiantov 6b3d6a9f7a
cups service: fix client sockets
Use systemd to create the directory for UNIX socket. Also use localhost instead
of 127.0.0.1 as is done in default cupsd.conf so that IPv6 is enabled when
available.

(cherry picked from commit 9c1c424e525b637560d91b99430b83cdaed24820)
2018-03-07 13:30:26 +01:00
obadz 4069dab3ca
nixos doc: give context and definition re NIXOS_LUSTRATE
Re #36272

(cherry picked from commit ee9a785c30c1bbc58ed77bd9c08e3cc208727572)
2018-03-07 13:30:23 +01:00
Jörg Thalheim 487731bcd3
Merge pull request #36350 from volth/nix-serve
nix-serve: nix 2.0 fixes
(cherry picked from commit 5fe1be88a53e7213e946600c08b2a9ba793ff921)
2018-03-07 13:30:16 +01:00
Frederik Rietdijk 8bcdb39a27
Merge pull request #27678 from volth/restore-bridge-slaves-dynamically-added-by-libvirt
nixos/networking-scripted: restore bridge slaves dynamically added by…
2018-03-05 17:31:22 +00:00
Dino Dai Zovi ddf13e6646 nixos/initrd-network: add udhcpc.extraArgs option (#36305)
This can be used to fix issues where udhcpc times out before
acquiring a lease. For example of these issues, see:

https://bugs.alpinelinux.org/issues/3105#note-8

Signed-off-by: Dino A. Dai Zovi <ddz@theta44.org>
2018-03-05 15:53:59 +00:00
Franz Pletz 17ba8bb3e0
Merge pull request #30416 from symphorien/luksnokey
nixos/luksroot.nix: fallback to interactive password entry when no keyfile found
2018-03-05 10:02:39 +00:00
Will Fancher 6b9a99e55d LightDM: Set default user session when possible. 2018-03-04 23:54:09 +00:00
Franz Pletz 0f78afdf25
Merge pull request #32248 from awakesecurity/parnell/fetchdocker
Support fetching docker images from V2 registries
2018-03-04 17:10:27 +00:00
Vladimír Čunát 498374a8bd
Merge #35554: nixos/opengl: unhide and document 2018-03-04 17:33:01 +01:00
obadz 9dc62dd915
Merge pull request #36272 from obadz/nixos-lustrate-doc
nixos doc: document the installation process from other distros as well as NIXOS_LUSTRATE
2018-03-04 16:21:54 +00:00
obadz 80ea345494 nixos-enter: specify absolute path to bash
Not doing so makes it impossible to use nixos-enter from a non-NixOS
distro
2018-03-04 16:19:52 +00:00
obadz 7af0aa846e nixos doc: document the installation process from other distros as well as NIXOS_LUSTRATE 2018-03-04 16:19:52 +00:00
Vladimír Čunát 2069a2a002
Merge #35454: nixos/pump.io: remove 2018-03-04 10:49:25 +01:00
Vladimír Čunát a2b8d8fbe2
nixos/pump.io: also comment-out the uid 2018-03-04 10:48:29 +01:00
Jörg Thalheim a5dcde1a6f Revert "networkd: also load builtin modules"
This reverts commit d514dc220e.

breaks unpredicable network interfaces: https://github.com/NixOS/nixpkgs/pull/29768#issuecomment-370172863
2018-03-04 06:29:08 +00:00
Jörg Thalheim 6749f6e26e
Merge pull request #36249 from Ekleog/openldap-module-declarative-contents
Openldap module declarative contents
2018-03-03 19:00:13 +00:00
Jörg Thalheim b2acbe58b2 nixos/openldap: add test 2018-03-03 18:53:52 +00:00
aszlig 0811e7f60e
nixos/netboot: Fix evaluation error
The function arguments for make-squashfs.nix have changed in
df117acab7, so we need to change them here
as well.

The boot.netboot NixOS VM test now succeeds again.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra
2018-03-03 19:31:19 +01:00
Jörg Thalheim 5d0d140f74
Merge pull request #34070 from lukeadams/prl-improve
Improve parallels-tools
2018-03-03 17:34:57 +00:00
Vladimír Čunát 729d72f9e4
18.03 release notes: nix-2.0 by default 2018-03-03 18:03:13 +01:00
Vladimír Čunát b70c93f211
Merge branch 'master' into nix-2.0 2018-03-03 18:02:35 +01:00
Vladimír Čunát ac3b53707c
18.03 release notes: highlight linux and gcc updates 2018-03-03 18:01:20 +01:00
Vladimír Čunát 7b2cf5b12e
lib.addPassthru: removed as scheduled 2018-03-03 17:57:38 +01:00
Jörg Thalheim 9936ed4920
Merge pull request #31019 from teto/strongswan_rebased
[RFC/RDY] make l2tp work with Strongswan
2018-03-03 15:56:05 +00:00
Léo Gaspard aeef7c91f1
openldap module: allow defining contents declaratively 2018-03-03 15:33:23 +01:00
Léo Gaspard cca9ec2a66
openldap module: cleanup 2018-03-03 15:33:01 +01:00
aszlig 88530e02b6
systemd: Update to latest NixOS branch
Updated to the latest version of the nixos-v237 branch, which fixes two
things:

  * Make sure that systemd looks in /etc for configuration files.
    https://github.com/NixOS/systemd/pull/15
  * Fix handling of the x-initrd.mount option.
    https://github.com/NixOS/systemd/pull/16

I've added NixOS VM tests for both to ensure we won't run into
regressions. The newly added systemd test only tests for that and is by
no means exhaustive, but it's a start.

Personally I only wanted to fix the former issue, because that's the one
I've been debugging. After sending in a pull request for our systemd
fork (https://github.com/NixOS/systemd/pull/17) I got a notice from
@Mic92, that he already fixed this and his fix was even better as it's
even suitable for upstream (so we hopefully can drop that patch
someday).

The reason why the second one came in was simply because it has been
merged before the former, but I thought it would be a good idea to have
tests for that as well.

In addition I've removed the sysconfdir=$out/etc entry to make sure the
default (/etc) is used. Installing is still done to $out, because those
directories that were previously into sysconfdir now get into
factoryconfdir.

Quote from commit NixOS/systemd@98067cc806:

  By default systemd should read all its configuration from /etc.
  Therefore we rely on -Dsysconfdir=/etc in meson as default value.
  Unfortunately this would also lead to installation of systemd's own
  configuration files to `/etc` whereas we are limited to /nix/store. To
  counter that this commit introduces two new configuration variables
  `factoryconfdir` and `factorypkgconfdir` to install systemd's own
  configuration into nix store again, while having executables looking
  up files in /etc.

Tested this change against all of the NixOS VM tests we have in
nixos/release.nix. Between this change and its parent no new tests were
failing (although a lot of them were flaky).

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @Mic92, @tk-ecotelecom, @edolstra, @fpletz
Fixes: #35415
Fixes: #35268
2018-03-03 10:39:38 +01:00
Jan Tojnar 618ac29687
cantarell-fonts: rename from cantarell_fonts 2018-03-03 00:36:38 +01:00
Bjørn Forsman 5de8f99f03 nixos/jenkins: ensure postStart follows redirects
Pass the -L flag to curl to make it follow redirects. This fixes an
issue I found when setting up reverse proxy for Jenkins. Without this
fix, the returned HTTP code was stuck at 302, making postStart fail the
service (it expects 200 or 403).
2018-03-02 08:48:38 +01:00
Shea Levy 2802101e9f
Merge branch 'dropbear-2018-76-fix' 2018-03-01 21:35:06 -05:00
Shea Levy f2937b7485
initrd-ssh: Fix for new dropbear version.
For some reason 2018.76 dropped the -m flag.
2018-03-01 21:21:27 -05:00
Luke Adams 52747120c1 parallels: add package config option
allows overriding of package with newer versions
2018-03-01 17:09:13 -06:00
Luke Adams 2c5efdbec4 parallels: add `autoMountShares` option 2018-03-01 16:36:37 -06:00
WilliButz 5ea2c87464
grafana: 4.6.3 -> 5.0.0 2018-03-01 17:50:09 +01:00
lejonet 565f22d27a nixos/ceph: init module (#35299)
All 5 daemon types can be enabled and configured through the module and the module both creates the ceph.conf required but also creates and enables specific services for each daemon, based on the systemd service files that upstream provides.
2018-03-01 11:47:13 +00:00
Jörg Thalheim 12422149a7
Merge pull request #29768 from Mic92/networkd
networkd: also load builtin modules
2018-03-01 09:16:18 +00:00
Shea Levy 5ff15fbf7d
Merge branch 'nix-ssh-ng' 2018-02-28 17:04:19 -05:00
Shea Levy 4de72b90f3
nixos: nix.sshServe: Support ssh-ng. 2018-02-28 16:55:00 -05:00
Jörg Thalheim 47ce3021a9
Merge pull request #36136 from hedning/nix-bash-completions-on-enableCompletion
programs/bash: install nix-bash-completions if completion is enabled
2018-02-28 21:23:53 +00:00
Frederik Rietdijk cf0c20e0de
Merge pull request #35892 from Nadrieril/update-usbguard
usbguard: 0.7.0 -> 0.7.2
2018-02-28 20:30:30 +00:00
Sander van der Burg 8fbfd67f1f disnix module: make dbus service configurable 2018-02-28 21:29:24 +01:00
Tor Hedin Brønner c58072309c programs/bash: install nix-bash-completions if completion is enabled 2018-02-28 19:13:02 +01:00
David Asabina e41ca3b347 digitalbitbox: init at 2.2.2 (#33787)
* digitalbitbox: init at 2.2.2

The commits that lead to this have been squashed from independent
commits see branch @vidbina/add/digitalbitbox-wip that did the
following:
 - 0a3030fa0ec digitalbitbox: init at 2.2.2
 - c18ffa3ffd4 digitalbitbox: moved meta to EOF
 - 0c5f3d6972a digitalbitbox: using preConfigure + configureFlags
 - a85b1dfc3fd digitalbitbox: nativeBuildInputs
 - 90bdd35ef0f digitalbitbox: autoreconfHook
 - 91810eea055 digitalbitbox: default installPhase & makeWrapper
 - 90e43fb7e2a digitalbitbox: doc rm $PWD hack & printf-tee deal
 - fd033b2fe5a digitalbitbox: cleanup, alphabetically sort attrs
 - c5907982db3 digitalbitbox: added hardware module
 - 88e46bc9ae0 digitalbitbox: added program module
 - amend to change name: dbb-app -> digitalbitbox
 - amend to add install instructions based on feedback
 (https://github.com/NixOS/nixpkgs/pull/33787#issuecomment-362813149)
 - amend to add longDescription
 - moved program to its own dir
 - overridable udev rules handling
 - added docs to manual
 - added package attr to program module
 - added package attr to hardware module

* digitalbitbox: use libsForQt5.callPackage
2018-02-27 22:40:22 +00:00
Eelco Dolstra ceb0a28e8c
Don't try hashed mirrors in the installer test 2018-02-27 20:30:06 +01:00
Eelco Dolstra 9fc786c3a4
Create /home with the right permissions
Without this, it will be created with 700 permissions.
2018-02-27 20:28:49 +01:00
Eelco Dolstra 9e8cf40c7e
nixos/tests/installer.nix: Don't use a writable store
This is no longer needed.
2018-02-27 20:22:14 +01:00
Eelco Dolstra 84f93dd07a
nixos-install: Create /root/.nix-defexpr
This was previously done by nixos-prepare-root.
2018-02-27 20:21:23 +01:00
Eelco Dolstra b14d9e1568
Add jq to the installation media
This is required by closureInfo.
2018-02-27 20:20:37 +01:00
Eelco Dolstra 0867f303bd
Add the boot test to release-small.nix 2018-02-27 20:09:07 +01:00
Eelco Dolstra 212dd84dd2
Cleanup 2018-02-27 20:03:12 +01:00
Eelco Dolstra cc2eeef4ab
Fix installing the Nixpkgs channel on the installation media
And test that it got installed correctly.
2018-02-27 19:58:23 +01:00
Nadrieril 297fac40ca nixos/usbguard: Do not check permissions on rules file (using undocumented -P flag) 2018-02-27 18:34:02 +00:00
Rodney Lorrimar c95ef47c51
Release notes: mention removal of pump.io module 2018-02-27 12:52:52 +00:00
Rodney Lorrimar 21dcead5f0
nixos/pump.io: remove
This would probably be better maintained in a separate repo as an
external NixOS module which gets imported into user's configuration.
2018-02-27 12:52:51 +00:00
adisbladis 4f59f26faf nodejs: Add release note about dropped 4_x packages 2018-02-27 10:19:23 +01:00
Frederik Rietdijk 05623d202c
Merge pull request #35061 from lopsided98/buildbot-update
buildbot: 0.9.15.post1 -> 1.0.0
2018-02-27 07:43:46 +00:00
Will Dietz ec6ce86266
Merge pull request #35682 from volth/patch-110
nixos/tests: add forgotten xrdp.nix
2018-02-26 21:46:22 -06:00
Aristid Breitkreuz b8f4df9d9e attempt to fix #30940 more robustly 2018-02-26 22:19:12 +01:00
volth 7e4c8db475
nixos/tests: add forgotten xrdp.nix 2018-02-26 19:55:07 +00:00
Franz Pletz 37c009ca74
Merge pull request #34028 from florianjacob/matomo
piwik is now matomo
2018-02-26 06:53:58 +00:00
Peter Hoeg 095260a1c9 nixos udevil: set up wrapper for udevil 2018-02-26 14:30:22 +08:00
Peter Hoeg f9cc3c08e2
Merge pull request #35432 from timokau/syncthing-deprecate-inotify
syncthing,qsyncthingtray: remove syncthing-inotify
2018-02-26 11:04:33 +08:00
Jan Tojnar a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
Linus Heckemann c255b10818 nixos/opengl: unhide and document enable option 2018-02-25 16:34:34 +00:00
Sarah Brofeldt 2ea8f8acdf nixos/mysql: Unbreak initial database creation 2018-02-24 20:07:55 +01:00
Jörg Thalheim c0b652d6cd
Merge pull request #35461 from lheckemann/grub-by-id
grub module: suggest by-id paths for devices
2018-02-24 11:30:34 +00:00
Linus Heckemann fd77a08b34 grub module: suggest by-id paths for devices
Since they are more stable, their use should be encouraged over that of
potentially volatile identifiers like /dev/[sh]da.
2018-02-24 10:50:23 +00:00
Timo Kaufmann 5643128ff2 syncthing,qsyncthingtray: remove syncthing-inotify
syncthing-inotify is replaced by the new syncthing "fswatcher" feature.
2018-02-24 01:08:44 +01:00
Aristid Breitkreuz e349ccc77f nixos/alsa: Do not make sound.enable conditional on stateVersion.
Eelco Dolstra wrote:

Hm, this is not really the intended use of stateVersion. From the description:

        Every once in a while, a new NixOS release may change
        configuration defaults in a way incompatible with stateful
        data. For instance, if the default version of PostgreSQL
        changes, the new version will probably be unable to read your
        existing databases. To prevent such breakage, you can set the
        value of this option to the NixOS release with which you want
        to be compatible. The effect is that NixOS will option
        defaults corresponding to the specified release (such as using
        an older version of PostgreSQL).

So this is only intended for options that have some corresponding on-disk state. AFAICT this is not the case for sound. In any case stateVersion is a necessary evil that only exists because we can't just upgrade Postgres databases or change SSH host keys. It's not necessary for things like whether sound is enabled. (If the user discovers that sound is suddenly disabled, they can just enable it.)

I had some vague recollection that we also had a configVersion option setting to control the defaults for non-state-related options, but I can't find it so maybe it was only discussed.
2018-02-23 23:14:42 +01:00
volth 270f99f7bf
nixos/programs.chromium: write policies for google-chrome too
Policy configuration files live under /etc/chromium for Chromium, and under /etc/opt/chrome for Google Chrome.
2018-02-23 19:00:26 +00:00
Tom Bereknyei 034d3fae3d tinc: enable invitations 2018-02-23 11:59:37 -05:00
Jan Tojnar 3b512ca185
Merge pull request #35065 from jtojnar/fwupd-1.0.5
fwupd: 1.0.5 update & cleanups
2018-02-23 17:22:47 +01:00
Nikolay Amiantov cc52eff6c6 Revert "cups service: fix client sockets"
This reverts commit cf4c077343.
2018-02-23 18:47:43 +03:00
Nikolay Amiantov cf4c077343 cups service: fix client sockets
Use systemd to create the directory for UNIX socket. Also use localhost instead
of 127.0.0.1 as is done in default cupsd.conf so that IPv6 is enabled when
available.
2018-02-23 18:43:51 +03:00
Jörg Thalheim df4963daca
Merge pull request #35343 from gnidorah/softether
softether module: fix dataDir option
2018-02-23 12:38:11 +00:00
Franz Pletz 6180eda1e4
Merge pull request #35026 from alesguzik/acpid_log_events
nixos/acpid: add option to log events
2018-02-23 04:36:33 +00:00
Franz Pletz 278bc22498
Merge pull request #31619 from NeQuissimus/exclude_rtl8723bs
rtl8723bs: Only include in enableAllFirmware if valid
2018-02-23 04:10:45 +00:00
volth 985a4bb87c
nixos/tox-bootstrapd: new command line format 2018-02-23 03:26:18 +00:00
Franz Pletz a04f6245a8
nixos/manual: fix build
Broken due to a43e33d0e4.
2018-02-23 00:28:20 +01:00
Franz Pletz 4e4ae18c19
browserpass module: add firefox support 2018-02-23 00:25:40 +01:00
Franz Pletz 7ea15ef9c6
nixpkgs module: update config example
firefox.enableGeckoMediaPlayer does not exist anymore.
2018-02-23 00:21:15 +01:00
Franz Pletz 0dcf5df0ed
Merge pull request #34470 from WilliButz/fix-xautolock
nixos/xautolock: fix default defaults/examples, add assertions
2018-02-22 23:10:03 +00:00
Aristid Breitkreuz a43e33d0e4 nixos: disable sound by default, if stateVersion >= 18.03 (#35355) 2018-02-22 22:06:31 +00:00
Florian Jacob 885e762d47 nixos/matomo: improve serverName default
when we need to change it anyway for the rename.
2018-02-22 22:03:55 +01:00
Florian Jacob 48e449ee70 nixos/piwik: rename to matomo 2018-02-22 22:03:55 +01:00
volth eef641aa6d
nixos/label: no prepend '-' if there are no tags 2018-02-22 19:44:21 +00:00
volth 073d3f0869
nixos/programs.chromium: remove unicode char '↪' 2018-02-22 17:55:33 +00:00
Frederik Rietdijk d328ba753e
Merge pull request #35243 from FRidh/postgis
postgis: get rid of composableDerivation
2018-02-22 16:49:56 +00:00
Eelco Dolstra d12c9911df
Merge remote-tracking branch 'origin/master' into nix-2.0 2018-02-22 17:28:51 +01:00
Profpatsch 186c765398 rabbitmq: 3.6.10 -> 3.6.15 (and various improvements)
- split outputs (doc, man, out)
- a new runtime dependency on getconf
- fix up SCRIPTS_DIR in wrapper
- clean output folder of stray doc files
- add license & maintainer

Tested with `nixos/tests/rabbitmq.nix`, inside a docker image and manually.
2018-02-22 17:04:20 +01:00
Eelco Dolstra 32af695a22
nix: 1.11.16 -> 2.0 2018-02-22 17:03:27 +01:00
gnidorah fbeb32994b softether module: fix dataDir option 2018-02-22 18:37:59 +03:00
Tim Steinbach 9f71de75af
rtl8723bs: Only include in enableAllFirmware if valid 2018-02-22 08:52:50 -05:00
Jan Tojnar d4075700d6
Revert "nixos tests: disable fwupd for now"
This reverts commit 11fc2bad56.
2018-02-22 13:18:23 +01:00
Jan Tojnar 30cc156c8c
nixos/fwupd: use manual list of etc files
Closes: #32142
2018-02-22 13:18:23 +01:00
Vladimír Čunát 1cacfe357b
nixos.tests.boot-stage1: fix missing libelf 2018-02-22 04:04:49 +01:00
Ales Huzik 444cdf0454 nixos/acpid: add option to log events 2018-02-21 22:17:33 +11:00
Marti Serra 30f27c49b9 crashplan-small-business: remove unneeded function 2018-02-21 09:25:58 +01:00
Raymond Gauthier de1d486265 brscan4 module: Added to `modules-list.nix`.
As requested by multiples users in #20632.
2018-02-20 19:35:33 -05:00
Jörg Thalheim 57ad5dc844
Merge pull request #35078 from Mic92/powerdns
powerdns: 4.0.5 -> 4.1.1
2018-02-20 21:49:41 +00:00
Frederik Rietdijk b2f53c76f8 postgis: get rid of composableDerivation
In this change composableDerivation is removed in favor of
stdenv.mkDerivation.
2018-02-20 22:17:16 +01:00
Will Dietz ce3de0399b
Merge pull request #30057 from dtzWill/feature/webos-novacomd
webos: init novacom, novacomd, cmake-modules; add nixos service
2018-02-20 13:49:06 -06:00
Will Dietz 1bf5fae96b release: only run novacomd test on x86_64-linux
novacom and novacomd build on aarch64, but the daemon
fails to start with something like:

novacomd[547]: unhandled level 2 translation fault (11) at 0x00000000, esr 0x92000046

So, uh, nevermind that then.
2018-02-20 13:47:50 -06:00
Joachim F 46afc63b6f
Merge pull request #32062 from volth/patch-73
nixos/varnish: check .vcl syntax at compile time
2018-02-20 19:22:28 +00:00
Joachim F b30fae01cd
Merge pull request #32761 from xvapx/crashplan-small-business
crashplan-small-business: init at 6.6.0
2018-02-20 19:19:22 +00:00
Will Dietz 09e261c2f4 nixos/release: Add novacomd
This is unlikely to break and is a cheap test.
I'd like to be notified if it stops working.

If this ever blocks anything and I've been notified
you have my blessing to remove this as I doubt
many folks depend on it.
2018-02-20 12:39:14 -06:00
Will Dietz f32139cf78 nixos: Add basic test of novacomd 2018-02-20 11:03:49 -06:00
Will Dietz e5e29284a9 webos: init novacom, novacomd, cmake-modules; add nixos service 2018-02-20 10:34:19 -06:00
Franz Pletz 3942cbea67
Merge pull request #35161 from volth/patch-92
nixos/nat: support nat reflection
2018-02-20 16:26:26 +00:00
Franz Pletz 17952ee589
Merge pull request #35141 from abbradar/dhcpcd-order
dhcpcd service: fix service dependencies when default gateways are set
2018-02-20 16:07:49 +00:00
Michael Fellinger 8c9a8d6805 Document the makeTest length restriction 2018-02-20 16:36:16 +02:00
Michael Fellinger 0d988d6735 Only allow test names of up to 50 characters 2018-02-20 16:36:16 +02:00
zimbatm 3b30e4355b
Merge pull request #35129 from rvl/buildkite-agent-hooks
buildkite-agent service: declarative hooks and extraConfig option
2018-02-20 11:28:42 +00:00
Jörg Thalheim 263a8c721d
Merge pull request #35180 from dotlambda/attic
attic: uninit
2018-02-20 10:38:54 +00:00
Robert Schütz 663d6e8f9d attic: uninit
Attic is currently broken on master.
The Attic git repo has not been updated since May 2015.
Arch Linux also does not have an Attic package anymore.
Borg should be able to read Attic backups using
http://borgbackup.readthedocs.io/en/stable/usage/upgrade.html#attic-and-borg-0-xx-to-borg-1-x.
2018-02-20 11:32:35 +01:00
Richard Marko 7367918f44 nixos/nixops-dns: init (#34511) 2018-02-20 10:14:55 +00:00
Ben Creasy 385369eeb2 nixos/doc: document password-promptless installation (#35210) 2018-02-20 08:59:13 +00:00
Rodney Lorrimar e552633c20
nixos/buildkite-agent: add coreutils to PATH of service
This simplifies the service script and it's probable that many builds
will need coreutils anyway.
2018-02-20 08:17:14 +00:00
Rodney Lorrimar 21e9a3eb6f
nixos/buildkite-agent: add a default value for name option
Use the default name value from:
https://buildkite.com/docs/agent/configuration
2018-02-20 08:17:14 +00:00
Rodney Lorrimar 8132b24cdf
nixos/buildkite-agent: remove obsolete config setting
Newer versions of buildkite-agent can find the bootstrap script
themselves.
2018-02-20 08:17:13 +00:00
Rodney Lorrimar cf6463aa8c
nixos/buildkite-agent: enhance documentation for meta-data option
I assumed they were space-separated, which was wrong.

In future it might be better to allow specifying an attrset of strings
for the option.
2018-02-20 08:17:13 +00:00
Rodney Lorrimar 66586c86b9
nixos/buildkite-agent: declarative hooks configuration
Instead of having to set up a directory containing hook scripts, you
can now directly set module options to add hooks.
2018-02-20 08:17:12 +00:00
Rodney Lorrimar efefba7c9b
nixos/buildkite-agent: add extraConfig option
This is useful for things like enabling debugging and increasing agent
priority, which don't warrant extra module options.
2018-02-20 08:17:12 +00:00
Ben Creasy e8ddba2bcf
Remove Xfce-specific display manager tip
This is already covered in the previous chapter https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/configuration/x-windows.xml#L38-L46 - Xfce also depends on X and it doesn't need a special section on display managers.
2018-02-19 15:18:07 -08:00
Nikolay Amiantov d77984f571 network-interfaces-scripted service: delay setup if IPv6 is disabled
Even if IPv6 gateway is set, there's no need to set it early if IPv6 is disabled.
2018-02-19 23:33:54 +03:00
Nikolay Amiantov 5ff25fcd7e dhcpcd service: want for both IP stacks
We want to wait for both stacks to be active before declaring that network is active.
So either both default gateways must be specified or only IPv4 if IPv6 is disabled to
avoid dhcpcd for network-online.target.
2018-02-19 23:33:54 +03:00
Nikolay Amiantov 996ed0830e dhcpcd service: always want by multi-user
When default gateways were specified the service wasn't wanted by anything at
all before.
2018-02-19 23:31:45 +03:00
Moritz Ulrich 2cafea200c Virtualbox: Fix type error in `networking.interfaces.vboxnet0.ipv4.addresses`
This error introduced in e239c1e582
prevented evaluation on my machine.
2018-02-19 17:48:15 +01:00
Tim Steinbach 0500cf79af
plymouth: Fix reference to NixOS version 2018-02-19 11:05:32 -05:00
Michael Raskin 1e23a5a6e9
Merge pull request #34795 from oxij/os/nixosLabel-pt2
nixos: labels part 2
2018-02-19 14:45:17 +00:00
Michael Raskin 7d2642724f
Merge pull request #35111 from oxij/stdenv/available-evaluates
stdenv.mkDerivation: rename `meta.evaluates` -> `meta.available`
2018-02-19 14:15:06 +00:00
Michael Raskin 10b3f7d356
Merge pull request #27688 from rnhmjoj/routes
nixos/networking-interfaces: make static routes configurable
2018-02-19 14:12:58 +00:00
volth 328f8a6cba nixos/nat: support nat reflection 2018-02-19 13:16:09 +00:00
Vladimír Čunát 8b1cf100cd
Merge #35169: nixos/tests: fix ipv6 test failure 2018-02-19 11:38:16 +01:00
rnhmjoj a1dc3abf90
nixos/tests: fix test failure due to preferTempAddress changes 2018-02-19 11:31:20 +01:00
Shea Levy c64639b54c
nixos/binfmt: Initial binfmt_msc support. 2018-02-18 12:42:17 -05:00