Commit graph

8229 commits

Author SHA1 Message Date
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
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
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
Tuomas Tynkkynen 1e107443ad Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into staging 2018-03-03 22:40:32 +02: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
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 b70c93f211
Merge branch 'master' into nix-2.0 2018-03-03 18:02:35 +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
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
Shea Levy 34487947ce
nixos: Add nixpkgs.crossSystem option for cross-compilation 2018-03-01 14:58:15 -05:00
Shea Levy 95579af5ec
Merge remote-tracking branch 'origin/staging' into cross-nixos 2018-03-01 14:56:58 -05:00
Shea Levy fec543436d
nixos: Move uses of stdenv.shell to runtimeShell. 2018-03-01 14:38:53 -05:00
Shea Levy 948e290895
stage-2-init: Use the host bash as SHELL 2018-03-01 14:03:41 -05:00
Frederik Rietdijk 810dd0f984 Merge remote-tracking branch 'upstream/master' into HEAD 2018-03-01 20:00:42 +01:00
Shea Levy 897b7c7e9b
nixos: Fix initrd dependency detection when cross-compiling. 2018-03-01 13:31:36 -05:00
WilliButz 5ea2c87464
grafana: 4.6.3 -> 5.0.0 2018-03-01 17:50:09 +01:00
Shea Levy c54730dde8
gobjectIntrospection: Enable building without X11 support.
Also disable it when noXlibs in NixOS.
2018-03-01 07:36:36 -05: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
Tuomas Tynkkynen b8b2225f6b Merge remote-tracking branch 'upstream/master' into staging 2018-03-01 06:09:20 +02:00
Shea Levy 4d5be58a8f
Merge remote-tracking branch 'origin/master' into cross-nixos 2018-02-28 17:07:13 -05: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
Shea Levy fe406d66b2
nixos: sudo: Use build-time visudo for syntax check. 2018-02-28 15:01:33 -05:00
Shea Levy 8e6520540e
nixos: keymap: Fix cross-compilation. 2018-02-28 15:01:32 -05:00
Shea Levy cc81202293
nixos: initrd-kmod-blacklist-ubuntu: Fix cross-compilation. 2018-02-28 15:01:32 -05:00
Shea Levy b28cb72908
nixos: stage-1: Don't try to test binaries when cross-compiling. 2018-02-28 15:01:32 -05:00
Shea Levy aebb024b2f
nixos: Take glibcLocales from buildPackages.
No need to cross-compile pure data...
2018-02-28 15:01:32 -05:00
Shea Levy c0e814a434
nixos: udev: Generate hwdb with build-native udevadm. 2018-02-28 15:01:31 -05:00
Shea Levy a929301281
nixos: kexec: Disable on non-keexecable systems. 2018-02-28 15:01:31 -05:00
Tuomas Tynkkynen 34f95d92a2 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/misc/pytrainer/default.nix
	pkgs/development/tools/pew/default.nix
	pkgs/tools/misc/you-get/default.nix
2018-02-28 20:52:49 +02: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 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 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 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 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
Vladimír Čunát 6168c2e45f
Merge master into staging
This is to cleanup the (re-)revert of merge to master.
2018-02-26 22:55:11 +01:00
Aristid Breitkreuz b8f4df9d9e attempt to fix #30940 more robustly 2018-02-26 22:19:12 +01:00
Frederik Rietdijk 4f08b0fbac Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-26 10:50:18 +01: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
Tuomas Tynkkynen ae9d4faff9 Merge remote-tracking branch 'upstream/master' into staging 2018-02-24 02:05:30 +02: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 9c1c424e52 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:51:39 +03: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 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
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 30cc156c8c
nixos/fwupd: use manual list of etc files
Closes: #32142
2018-02-22 13:18:23 +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
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
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 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
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
Richard Marko 7367918f44 nixos/nixops-dns: init (#34511) 2018-02-20 10:14:55 +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
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 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
Shea Levy c64639b54c
nixos/binfmt: Initial binfmt_msc support. 2018-02-18 12:42:17 -05:00
Jan Malakhovski c6d8a58e8d nixos: allow overriding labels with environment variables
This reintroduces a better version of what 2a05368ff3 removed.
2018-02-18 12:56:31 +00:00
Jan Malakhovski 0fd8ce96ac nixos: introduce system.nixos.tags 2018-02-18 12:56:31 +00:00
Jan Malakhovski 2e6b796761 nixos: rename config.system.nixos* -> config.system.nixos.* 2018-02-18 12:56:30 +00:00
Jan Malakhovski 09512be289 nixos: use nixosLabel in more places 2018-02-18 12:56:30 +00:00
Jan Malakhovski 8200e08b0b nixos: move nixosLabel to its own module 2018-02-18 12:56:30 +00:00
Jan Malakhovski e1782e342f nixos: add system.boot.loader.initrdFile option and use it where appropriate 2018-02-18 12:56:29 +00:00
Bjørn Forsman d84f18e288 nixos/postfix: document that *Alias options support comma separated values
For the longest time I thought there could be only one rootAlias.
2018-02-18 13:04:08 +01:00
Silvan Mosberger c2b8d14b56
nixos/znapzend: fix when no previous zetup
When the znapzend module was enabled for the first time with pure =
true; then the list of previous entries is empty, but xargs still tried
to execute a znapzendzetup delete command with no arguments, which made
it fail
2018-02-17 15:50:48 +01:00
rnhmjoj e81811a579
nixos/modules: rename IP addresses/routes options 2018-02-17 14:57:07 +01:00
rnhmjoj e239c1e582
nixos/tests: rename IP addresses/routes options 2018-02-17 14:57:07 +01:00
rnhmjoj c1bed05e34
nixos/networking-interfaces: rename IP addresses/routes options 2018-02-17 14:01:24 +01:00
rnhmjoj f41111c4da
nixos/tests: add test for static routes 2018-02-17 14:01:23 +01:00
rnhmjoj d00c91c5da
nixos/networking-interfaces: make static routes configurable 2018-02-17 13:57:58 +01:00
Alexei Robyn ab45e13e07 nixos/dante: order after network-online.target (#34435)
network-online.target properly depends on the underlying network
management tool (e.g. NixOS static configuration scripts, dhcpcd,
NetworkManager, networkd) signalling that all interfaces are up and
appropriately configured (to whatever degree possible/required), whereas
network.target only indicates that the network management tool itself
has started.
2018-02-17 10:18:05 +00:00
Joachim F faf072166b
Merge pull request #29869 from Nadrieril/syncserver-fup
syncserver service: follow-up of #28189
2018-02-17 10:09:42 +00:00
Niklas Hambüchen f00a1514f9 nixos/nginx: validate config syntax in preStart (#24664) 2018-02-17 09:45:25 +00:00
Joachim F 71a32c36fe
Merge pull request #34587 from netixx/add-freeradius-service
nixos/freeradius : init - Added freeradius service
2018-02-17 09:17:35 +00:00
Joachim F cac0d0eb33
Merge pull request #34803 from mt-caret/lxd-partial-fix
nixos/lxd: partial fix for lxd breakage
2018-02-17 09:08:08 +00:00
Joachim F 7bf049a54c
Merge pull request #34492 from rnhmjoj/privacy
nixos/networking-interfaces: add preferTempAddress option
2018-02-17 08:41:23 +00:00
Matthieu Coudron 1912870a6e nixos/boot: allow kernel.printk override (#34958)
At one point in my configuration I had:
boot.kernel.sysctl = {
      # https://unix.stackexchange.com/questions/13019/description-of-kernel-printk-values
      "kernel.printk" = "4	4	1	7";
};
which triggered:

error: The unique option `boot.kernel.sysctl.kernel.printk' is defined multiple times, in `/home/teto/dotfiles/nixpkgs/mptcp-unstable.nix' and `/home/teto/nixpkgs/nixos/modules/system/boot/kernel.nix'.
(use ‘--show-trace’ to show detailed location information)
Traceback (most recent call last):
  File "/home/teto/nixops/scripts/nixops", line 984, in <module>
    args.op()
  File "/home/teto/nixops/scripts/nixops", line 406, in op_deploy
    max_concurrent_activate=args.max_concurrent_activate)
  File "/home/teto/nixops/nixops/deployment.py", line 1045, in deploy
    self.run_with_notify('deploy', lambda: self._deploy(**kwargs))
  File "/home/teto/nixops/nixops/deployment.py", line 1034, in run_with_notify
    f()
  File "/home/teto/nixops/nixops/deployment.py", line 1045, in <lambda>
    self.run_with_notify('deploy', lambda: self._deploy(**kwargs))
  File "/home/teto/nixops/nixops/deployment.py", line 985, in _deploy
    self.configs_path = self.build_configs(dry_run=dry_run, repair=repair, include=include, exclude=exclude)
  File "/home/teto/nixops/nixops/deployment.py", line 653, in build_configs
    raise Exception("unable to build all machine configurations")
Exception: unable to build all machine configurations

This simple addition allows to override it.
2018-02-17 06:47:33 +00:00
Tim Steinbach 87559028ef
Merge pull request #33954 from kuznero/pr/kubernetes
kubernetes: 1.7.9 -> 1.9.1
2018-02-16 13:56:59 +00:00
Vladimír Čunát b5aaaf87a7
Merge staging and PR #35021
It's the last staging commit (mostly) built on Hydra,
and a minimal fix for Darwin regression in pysqlite.
2018-02-16 09:13:12 +01:00
Herwig Hochleitner b7b2a4ffa4 connmand: add extraFlags option to service 2018-02-15 23:37:12 +01:00
Nikolay Amiantov 56e0943b08 makeModulesClosure: support firmware
Link it in stage 1.
2018-02-16 00:11:07 +02:00
Herwig Hochleitner 23b5421c46 nixos: make boot.kernel.features internal
This isn't useful as public API. It should be used by options to
activate kernel features for use with specific programs.
2018-02-15 09:10:32 +01:00
Herwig Hochleitner 28875192ae programs.systemtap: add nixos option for installing systemtap
also enables debug feature on kernel
2018-02-15 09:10:32 +01:00
Herwig Hochleitner 66080ae4d8 programs.criu: add nixos option for installing criu + kernel flags 2018-02-15 09:10:32 +01:00
Herwig Hochleitner 0b621321cd boot.kernel.features: add nixos option for setting kernel features
this allows setting the features attribute for
pkgs/os-specific/linux/kernel/common-config.nix
2018-02-15 09:10:32 +01:00