jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
136,967 Commits 266 Branches 122 Tags 5.3 GiB
ec1419bad8
Commit Graph

8305 Commits

Author SHA1 Message Date
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 cf4c07734364e7e59414f486381360b42a9f88ea.
 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 e239c1e5820bdbb3d94ccc46e2d6756b0d37057d
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 2a05368ff3217175cd87105e778e2e70bc7eef1c 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
Franz Pletz
79e7f7af9a
radvd service: fix due to systemd upgrade 
After the systemd 237 upgrade, radvd wouldn't start anymore because the
PID file cannot be written. It seems that directories in /run has to be
explicitely defined as RuntimeDirectory now. The PID file isn't needed
due to systemd, though, so it was removed along with forking and loggia
via syslog.

This fixes the ipv6 NixOS test.
 2018-02-15 07:02:08 +01:00
Jan Tojnar
640916d55d
nixos/fwupd: add maintainers 2018-02-15 01:11:13 +01:00
Sam Parkinson
16fa6f59f7
nixos/plotinus: add module to enable plotinus 2018-02-14 22:25:12 +01:00
Frederik Rietdijk
177cfe3370
Merge pull request #34974 from dotlambda/prosody 
nixos/prosody: add package option
 2018-02-14 20:35:01 +00:00
Frederik Rietdijk
672bb6b4ab Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-14 21:30:08 +01:00
Lassulus
8acde7b612 nixos/gnunet: set private TMPDIR (#34945) 2018-02-14 15:35:30 +00:00
Robert Schütz
de74ffb8f8 nixos/prosody: add package option 2018-02-14 14:56:00 +01:00
adisbladis
1de98e8568
plasma: 5.11.5 -> 5.12.1 2018-02-14 17:24:20 +08:00
Alexey Lebedeff
6d442efe99 zsh-autoenv: init at 2017-12-16 (#34932) 2018-02-14 06:31:59 +00:00
Jan Tojnar
44695e7045
Merge pull request #34507 from jtojnar/pipewire 
pipewire: init at 0.1.8
 2018-02-14 02:29:39 +01:00
Tuomas Tynkkynen
1a06373c0a Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/development/libraries/libclc/default.nix
	pkgs/top-level/all-packages.nix
 2018-02-13 16:42:55 +02:00
Jörg Thalheim
67b1d6a16d
Merge pull request #34905 from vcunat/p/kresd-TLS 
kresd service: add listenTLS option
 2018-02-13 10:41:52 +00:00
Franz Pletz
eb862c48dd
systemd: 234 -> 237 
Co-Authored-By: Florian Klink <flokli@flokli.de>
Co-Authored-By: Andreas Rammhold <andreas@rammhold.de>
 2018-02-13 01:24:24 +01:00
Ruben Maher
ac52cb3aed nixos/prometheus/alertmanager: double hyphenate long opts (#34914) 
Alertmanager 0.13.0 doesn't support single dash long options, so '-config.file'
for example is parsed as '-c', which leads to the service not starting.
 2018-02-12 18:02:38 -05:00
Vladimír Čunát
05d6a7edb6
kresd service: add listenTLS option 
Also fix some deficiencies in the systemd multi-socket stuff.
 2018-02-12 20:48:25 +01:00
Franz Pletz
74736f26c2
bird2: init at 2.0.1 2018-02-11 23:35:05 +01:00
Vladimír Čunát
968b866dcc
Merge #32774: slurm-spank-x11: init at 0.2.5 2018-02-10 22:48:22 +01:00
Daniel Schaefer
713a69d083 nixos/acpid: pass event parameters to handler (#34190) 
Previously the parameters were just dropped. Now they can be read
from within the handler script. An example to show this is added.

Makes use of the new writeShellScript function as suggested in:
issue #21557

resolves:  #21557
 2018-02-10 13:26:05 +00:00
Jörg Thalheim
2cab78bc1d
Merge pull request #34384 from gnidorah/nvidia-optimus 
modules/nvidia-optimus: fix module blacklisting
 2018-02-10 12:14:21 +00:00
Jörg Thalheim
9fab083b79
Merge pull request #34524 from Infinisil/physlock-allowAnyUser 
nixos/physlock: add allowAnyUser option
 2018-02-10 09:58:36 +00:00
Jörg Thalheim
7914e6be3e
Merge pull request #34655 from markus1189/zookeeper-package-option 
zookeeper.service: option for package and add to environment
 2018-02-10 09:54:12 +00:00
Netix (Espinet François)
2a2e885cd0 nixos/freeradius : init - Added freeradius service 
Inspired from the dhcpd service implementation
Only 2 configurations options at the moment:
- enabled
- path to config directory (defaults to /etc/raddb)

Implementation was also inspired from ArchLinux
systemd file and corrected with @dotlambda and
@fpletz help.
 2018-02-10 09:59:01 +01:00
Masayuki Takeda
65faff97ff nixos/lxd: partial fix 2018-02-10 17:18:53 +09:00
Jörg Thalheim
79315b632e
Merge pull request #34728 from dpc/master 
Add pam option to enable Google Authenticator
 2018-02-10 08:16:50 +00:00
Jörg Thalheim
5be14cce39
Merge pull request #34753 from noqqe/master 
Multiple users with hashedPassword is broken in mosquitto
 2018-02-10 07:59:49 +00:00
markuskowa
bf53dc68c2 nixos/rdma-core: add module for soft RoCE and test (#34607) 2018-02-10 07:52:03 +00:00
Dawid Ciężarkiewicz
5c746a0a84 nixos/pam: support for Google Authenticator 2018-02-09 21:09:03 -08:00
Graham Christensen
5aabf0fc34
Merge pull request #33898 from oxij/nixos/related-packages-v5 
nixos: doc: implement related packages in the manual (again)
 2018-02-09 20:36:27 -05:00
Jan Malakhovski
0d1a643210 nixos/xen-dom0: add related packages, make it play well with them 
This is a custom attribute set example of `relatedPackages` option usage.
 2018-02-09 19:51:07 +00:00
Jan Malakhovski
e5268344fe nixos/adb: add related package 
This is an attribute path example of `relatedPackages` option usage.
 2018-02-09 19:51:06 +00:00
Jan Malakhovski
eb38b8676a nixos/tmux: add related package 
This is a trivial example of `relatedPackages` option usage.
 2018-02-09 19:51:06 +00:00
Franz Pletz
1fcbc7055c
Merge pull request #33700 from roberth/nixos-externalpkgs 
nixos: Add nixpkgs.pkgs option
 2018-02-09 18:47:48 +00:00
Franz Pletz
3748f3aac8
Merge pull request #32582 from Ma27/yabar-module 
yabar: add module
 2018-02-09 18:43:59 +00:00
Andreas Rammhold
04051ee9d0
Merge pull request #34562 from griff/rspamd-workers 
nixos/rspamd: worker configuration, socket activation and tests
 2018-02-09 14:45:54 +01:00
Andreas Rammhold
7ae9699e1c
Merge pull request #34759 from dotlambda/dovecot 
nixos/dovecot: no " in mailbox.name
 2018-02-09 12:43:03 +01:00
Robert Schütz
6ceece6b59 nixos/dovecot: no " in mailbox.name 2018-02-09 12:20:55 +01:00
Hamish
3a2b0cdf5c nixos/traefik: make group configurable for docker support (#34749) 2018-02-09 09:37:29 +00:00
Brian Olsen
908fc5e14b
nixos/rspamd: options for worker configuration and socket activation 2018-02-09 06:19:03 +01:00
Florian Baumann
7e76b127cd
Multiple users with hashedPassword is broken in mosquitto 
If you have more than 1 User with hasedPassword Option set it generates 

```
rm -f /var/lib/mosquitto/passwd
touch /var/lib/mosquitto/passwd
echo 'user1:$6$xxx' > /var/lib/mosquitto/passwd
echo 'user2:$6$xxx' > /var/lib/mosquitto/passwd
```

Which ends up in only having 1 user.
 2018-02-08 22:46:06 +01:00
Joachim F
65e6fbf2b5
Merge pull request #34690 from dotlambda/tor 
nixos/tor: add hiddenServices.<name>.authorizeClient
 2018-02-08 17:08:44 +00:00
Eric Bailey
6b45dbd99c services.mysql: properly quote database.name 2018-02-08 17:32:41 +01:00
Eelco Dolstra
6bc889205a
sshd: Remove UsePrivilegeSeparation option 
This option is deprecated, see https://www.openssh.com/txt/release-7.5.
 2018-02-08 13:32:55 +01:00
Frederik Rietdijk
c0f6aac818
Merge pull request #34574 from dotlambda/home-assistant 
nixos/home-assistant: support platform=... scheme for autoExtraComponents
 2018-02-08 10:53:35 +00:00
Jörg Thalheim
b6bcba6537 nixos/zfs: fix typo in enableLegacyCrypto description 2018-02-08 10:24:47 +00:00
Robert Schütz
355de06fe4 nixos/tor: add hiddenServices.<name>.authorizeClient 2018-02-08 10:02:22 +01:00
sjau
0d65e2e0e5 zfs: add migration path for new crypto format 
fixes #34559
 2018-02-07 20:46:16 +00:00
Thomas Pham
f0bafef6a1 add Serviio Media server package and service 2018-02-07 20:45:30 +01:00
Eelco Dolstra
847ea13be3
Doh 2018-02-07 19:47:03 +01:00
Eelco Dolstra
0f5d5970b2
nixos-prepare-root: Remove 
This is no longer needed thanks to Nix 2.0 magic.
 2018-02-07 19:39:14 +01:00
Eelco Dolstra
5d8860b919
nixos-install: Accept --substituters 
This is useful in tests where we don't have network access. Passing
--substituters "" prevents wasting time by checking cache.nixos.org.
 2018-02-07 19:39:13 +01:00
Eelco Dolstra
598a3f5b30
nixos-install: Create /etc 2018-02-07 19:10:13 +01:00
Eelco Dolstra
6daad9b3c5
nixos-install: Fix --closure 2018-02-07 18:22:05 +01:00
Eelco Dolstra
da702a4034
nixos-enter: Don't require root 
Of course, you'll get a bunch of warnings from the activation script:

  $ nixos-enter --root /tmp/mnt/
  setting up /etc...
  mount: /dev: permission denied.
  mount: /dev/pts: permission denied.
  mount: /dev/shm: permission denied.
  mount: /sys: permission denied.
  /nix/var/nix/profiles/system/activate: line 74: /proc/sys/kernel/modprobe: Permission denied
  chown: changing ownership of '/run/wrappers/wrappers.0pKlU8JsvV/dbus-daemon-launch-helper': Invalid argument
  NOTE: Under Linux, effective file capabilities must either be empty, or
        exactly match the union of selected permitted and inheritable bits.
  Failed to set capabilities on file `/run/wrappers/wrappers.0pKlU8JsvV/ping' (Operation not permitted)
  chown: changing ownership of '/run/wrappers/wrappers.0pKlU8JsvV/unix_chkpwd': Invalid argument

  [root@nixos:/]#
 2018-02-07 17:59:04 +01:00
Eelco Dolstra
16bdaf3d03
Remove creation of /dev/{fd,stdin,stdout,stderr} 
This is already provided by devtmpfs.
 2018-02-07 17:58:21 +01:00
Eelco Dolstra
bb030ece3b
nixos-enter: Check whether --root denotes a NixOS installation 2018-02-07 17:23:05 +01:00
Eelco Dolstra
f0979ca30e
nixos-install: Don't require root 
E.g.

  nixos-install --root /tmp/mnt/ --no-bootloader --no-root-passwd

now works for non-root users.
 2018-02-07 17:20:26 +01:00
Eelco Dolstra
df117acab7
ISO images: Initialize the Nix database with correct NAR hashes/sizes 
The boot test now runs "nix verify" to ensure that all hashes are
correct.
 2018-02-07 16:54:23 +01:00
rnhmjoj
5118b86800 nixos/monero: init 2018-02-07 08:04:36 -05:00
Tuomas Tynkkynen
a008a9cb3b nixos/sd-image-armv7l-multiplatform: Port RPi config.txt changes from aarch64 image 
As was done in commit cd2e740dde9541ad5f1d9efd93bcb5a967379ece.
 2018-02-07 06:30:34 +02:00
Matthieu Coudron
fe4f4de1c9 strongswan module: make it work with ipsec l2tp 
l2tp saves its secrets into /etc/ipsec.d but strongswan would not read
them. l2tp checks for /etc/ipsec.secrets includes /etc/ipsec.d and if
not tries to write into it.

Solution:
Have the strongswan module create /etc/ipsec.d and /etc/ipsec.secrets
when networkmanager_l2tp is installed.
Include /etc/ipsec.secrets in
/nix/store/hash-strongswan/etc/ipsec.secrets so that it can find l2tp
secrets.

Also when the ppp 'nopeerdns' option is used, the DNS resolver tries to
write into an alternate file /etc/ppp/resolv.conf. This fails when
/etc/ppp does not exist so the module creates it by default.
 2018-02-07 13:21:49 +09:00
Robert Schütz
b5ecdfa977 nixos/acme: Fix xml (#34683) 2018-02-06 23:27:28 +00:00
Joachim Schiele
edeacd00ad security.acme: default name value via module system (#34388) 2018-02-06 21:08:57 +00:00
Joachim F
97ab8d8981
Merge pull request #17106 from spacefrogg/openafs 
openafs: Refactor and introduce server module
 2018-02-06 14:43:55 +00:00
Markus Hauck
77218de812 zookeeper.service: option for package and add to environment 2018-02-06 09:59:01 +01:00
Eelco Dolstra
cc0caac098
Move creation of /root to the activation script 
...so it appears in a new installation before rebooting the system.
 2018-02-05 22:12:18 +01:00
Eelco Dolstra
f9e64dbe76
nixos-enter: Don't mount special filesystems 
The activation script already does this.
 2018-02-05 21:05:02 +01:00
Eelco Dolstra
1346923ffa
modprobe activation: Order after specialfs 
It requires the existence of /proc.
 2018-02-05 21:04:40 +01:00
Eelco Dolstra
e88f28965a
nixos-install: Make compatible with Nix 2.0 
The use of Nix 2.0 significantly simplifies the installer, since we
can just pass a different store URI (--store /mnt) - it's no longer
needed to set up a chroot environment for the build, and to bootstrap
Nix into the chroot.

Also, commands that need to run in the installation (namely boot
loader installation and setting a root password) are now executed
using nixos-enter.

This also removes the need for nixos-prepare-root since any required
initialisation is done by Nix or by the activation script.
 2018-02-05 19:50:36 +01:00
Eelco Dolstra
60cb23001a
Add a "nixos-enter" command 
This factors out the functionality in nixos-install for running a
command inside a NixOS installation (nixos-install --chroot).
 2018-02-05 19:41:54 +01:00
Philipp Dörfler
35441b52d9
Wrapped ${mailbox.name} in "s to allow for space in mailbox names. 2018-02-05 17:06:49 +01:00
Frederik Rietdijk
ba34a70086
Merge pull request #33866 from yesbox/fix_newgrp 
nixos: sg/newgrp should always be available, not chfn
 2018-02-05 10:47:23 +00:00
David McFarland
fbba0d0ee5 matrix-synapse: default server_name to hostname 2018-02-04 21:22:55 -04:00
David McFarland
a4b7de74a5 matrix-synapse: default to postgresql on 18.03 2018-02-04 21:22:55 -04:00
David McFarland
1472fa8685 matrix-synapse: create and connect to local postgresql db 2018-02-04 21:22:54 -04:00
Thomas Tuegel
4688dd0cf5
Merge pull request #34526 from ttuegel/bugfix/plasma-integration/font-style 
plasma-integration: Fix font style name bug with Qt >= 5.8
 2018-02-04 17:41:50 -06:00
Sarah Brofeldt
bf58890a5a nixos/k8s: Enable Node authorizer and NodeRestriction by default 2018-02-04 21:23:36 +01:00
Thomas Tuegel
77a607aa88
nixos/plasma5: Fix font style names in kdeglobals 2018-02-04 13:31:04 -06:00
Robert Schütz
59eb19224b nixos/home-assistant: support platform=... scheme for autoExtraComponents 
See https://home-assistant.io/components/sensor.luftdaten/ for an example component using that scheme.
 2018-02-04 11:09:55 +01:00
Vladimír Čunát
dd57c63793
Merge branch 'staging' 
There are some Darwin regressions and a mysterious Lisp issue,
but also a security update of curl...
 2018-02-03 10:56:07 +01:00
Vladimír Čunát
84fb5c6a0d
nixos/availableKernelModules: add a keyboard module 
Non-working keyboards during boot are quite a problem; see:
https://github.com/NixOS/nixpkgs/pull/33529#issuecomment-361164997
 2018-02-03 10:46:53 +01:00
adisbladis
7ebb82e04f
home-assistant: Fix incorrect xml closing tag 2018-02-03 16:54:02 +08:00
Frederik Rietdijk
55e0f12761 Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-03 09:48:42 +01:00
Frederik Rietdijk
db58049f75
Merge pull request #34494 from dotlambda/home-assistant 
home-assistant: compute extraComponents from config
 2018-02-03 08:01:50 +00:00
Tuomas Tynkkynen
10c8e6d0c5 Merge remote-tracking branch 'upstream/master' into staging 2018-02-03 02:50:21 +02:00
Jörg Thalheim
a4170403e6
Merge pull request #33897 from rnhmjoj/digits 
Avoid package attributes starting with a digit
 2018-02-02 19:30:23 +00:00
Michael Raitza
d0ebdbd308 nixos/openafsServer: OpenAFS server nixos module 2018-02-02 16:43:44 +01:00
Shea Levy
43f647e5b4
Merge branch 'dynamic-function-args' 2018-02-02 09:41:16 -05:00
Vladimír Čunát
bbfca0f371
knot-resolver: 1.5.3 -> 2.0.0 (feature update) 
Also split extraFeatures into a wrapper derivation.
So far, no changes like user renaming nor systemd unit rework.
 2018-02-02 15:26:36 +01:00
Silvan Mosberger
cfd22b733b
physlock: add allowAnyUser option 2018-02-02 14:03:00 +01:00
Robert Schütz
78c2ca326e home-assistant: compute extraComponents from config 2018-02-02 09:48:50 +01:00
Jan Tojnar
dfe7a54d19
nixos/pipewire: init 2018-02-01 22:40:51 +01:00
Michael Raitza
ce74e1cc36 nixos/openafsClient: Extend client service functionality 
Add a lot of options to the client to make it more usable and compatible
with the OpenAFS server module.
 2018-02-01 16:35:24 +01:00
Michael Raitza
c389d705f3 nixos/openafsClient: relocate nixos module 2018-02-01 16:35:18 +01:00
rnhmjoj
1fec496f38
nixos/networking-interfaces: add preferTempAddress option 2018-02-01 13:14:09 +01:00
Jörg Thalheim
57d72d4140
Merge pull request #34442 from rnhmjoj/virtual 
Fix virtualType for network-interfaces-scripted
 2018-02-01 10:35:13 +00:00
rnhmjoj
e28ecd5528
fix 2018-02-01 10:51:35 +01:00
Frederik Rietdijk
d30735f889
Merge pull request #34188 from dotlambda/home-assistant 
home-assistant: init at 0.62.1
 2018-02-01 08:44:48 +00:00
Vladimír Čunát
2fb4606f38
Merge branch 'master' into staging 
Haskell rebuild.
Hydra: ?compare=1430378
 2018-02-01 09:36:23 +01:00
Eelco Dolstra
700e21d6da nix-daemon.nix: Updates for Nix 2.0 
* The environment variables NIX_CONF_DIR, NIX_BUILD_HOOK and
  NIX_REMOTE are no longer needed.

* A /bin/sh (from busybox) is provided by default in sandboxes.

* Various options were renamed.
 2018-01-31 22:26:05 +01:00
WilliButz
c2fa5f1729
nixos/xautolock: fix default defaults/examples, add assertions 
see issue #34371
 2018-01-31 21:43:23 +01:00
Shea Levy
943592f698
Add setFunctionArgs lib function. 
Among other things, this will allow *2nix tools to output plain data
while still being composable with the traditional
callPackage/.override interfaces.
 2018-01-31 14:02:19 -05:00
Robert Schütz
bacbc48cfe home-assistant: add NixOS module 2018-01-31 12:30:31 +01:00
rnhmjoj
46c158a32f
nixos/networking-interfaces: set default value for virtualType 2018-01-31 05:51:09 +01:00
Peter Hoeg
dc52fc6dda aria2 (nixos): actually load the module 
Fixes #33991
 2018-01-31 09:42:03 +08:00
Vladimír Čunát
c9171e5a4c
Merge branch 'master' into staging 
Hydra: ?compare=1430035
 2018-01-30 19:51:33 +01:00
Tuomas Tynkkynen
71631a922b runInLinuxVM: Use QEMU command line that works on other architectures 
... by moving the existing definition to qemu-flags.nix and reusing
that.
 2018-01-30 16:57:27 +02:00
Tuomas Tynkkynen
8e83158f12 nixos/qemu: Deduplicate QEMU serialDevice into qemu-flags.nix 2018-01-30 16:57:27 +02:00
Robert Hensing
f2a45a47d4 nixos: Add nixpkgs.pkgs option 
This lets the user set pkgs directly, so that it can be injected
externally and be reused among evaluations of NixOS.
 2018-01-30 12:57:03 +01:00
Jörg Thalheim
add22af095
Merge pull request #34381 from JohnAZoidberg/less 
nixos/less configure less with module
 2018-01-30 10:41:39 +00:00
Daniel Schaefer
288898d6f1 nixos/less: use lesspipe package for preprocessing 
Rather than a custom script the less config now uses the lesspipe
package config by default.
 2018-01-29 22:08:32 +07:00
gnidorah
7b2482ea54 modules/nvidia-optimus: fix module blacklisting 2018-01-29 15:46:15 +03:00
Daniel Schaefer
192c2330d0 nixos/less configure less with module 2018-01-29 18:40:22 +07:00
Jan Tojnar
0f21306ca3
Merge pull request #33900 from jtojnar/nginx-acme 
nixos/nginx: allow using existing ACME certificate
 2018-01-29 01:38:45 +01:00
Graham Christensen
e2a54266c4
openssh: Build with Kerberos by default 
This reverts commit 09696e32c390c232ec7ac506df6457fb93c1f536.
which reverted f596aa0f4a35f613422f85a4486e32ea20ca7739
to move it to staging
 2018-01-28 16:36:01 -05:00
Graham Christensen
15a4977409
Revert "openssh: Build with Kerberos by default" 
This reverts commit a232dd66ee0b390dc4d82858af7e15713bd60327.

Moving to staging
 2018-01-28 16:36:01 -05:00
Aneesh Agrawal
716d1612af
openssh: Build with Kerberos by default 
This can be disabled with the `withKerberos` flag if desired.
Make the relevant assertions lazy,
so that if an overlay is used to set kerberos to null,
a later override can explicitly set `withKerberos` to false.

Don't build with GSSAPI by default;
the patchset is large and a bit hairy,
and it is reasonable to follow upstream who has not merged it
in not enabling it by default.
 2018-01-28 16:36:00 -05:00
Graham Christensen
f596aa0f4a
Revert "openssh: Build with Kerberos by default" 
This reverts commit a232dd66ee0b390dc4d82858af7e15713bd60327.

Moving to staging
 2018-01-28 16:32:52 -05:00
Aneesh Agrawal
a232dd66ee
openssh: Build with Kerberos by default 
This can be disabled with the `withKerberos` flag if desired.
Make the relevant assertions lazy,
so that if an overlay is used to set kerberos to null,
a later override can explicitly set `withKerberos` to false.

Don't build with GSSAPI by default;
the patchset is large and a bit hairy,
and it is reasonable to follow upstream who has not merged it
in not enabling it by default.
 2018-01-28 16:30:46 -05:00
Franz Pletz
36103e9863
nixos/powerManagement: remove duplicate definition 
When not set just use the kernel default. `nixos-generate-config` will pick
a reasonable default.

cc #34350
 2018-01-28 21:53:07 +01:00
Franz Pletz
50dda062d8
Merge pull request #34350 from Ma27/fix-powermanagement-default 
nixos/powerManagement: set `cpuFreqGovernor` with `mkOptionDefault`
 2018-01-28 14:46:51 +00:00
Jesper
2b270c1596 nixos/containers: Enable use of the network.useHostResolvConf option (#34354) 2018-01-28 14:42:15 +00:00
Maximilian Bosch
8ed3a90cdf
nixos/powerManagement: set cpuFreqGovernor with mkOptionDefault 
`nixos-generate-config` detects the `cpuFreqGovernor` suited best for my
machine, e.g. `powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";`.

However the `powerManagement` module sets a sensitive default for
`cpuFreqGovernor` using `mkDefault` to avoid breackage with older
setups. Since 140ac2f1 the `hardware-configuration.nix` sets the
gorvernor with `mkDefault` as well which causes evaluation errors if the
powermanagement module is enabled:

```
error: The unique option `powerManagement.cpuFreqGovernor' is defined multiple times, in `/home/ma27/Projects/nixos-config/hardware-configuration.nix' and `/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/config/power-management.nix'.
```

Using `mkOptionDefault` rather than `mkDefault` in the powermanagement
module fixes this issue as it decreases the priority of the module and
prefers the value set in `hardware-configuration.nix`.

I have confirmed the change using the following VM declaration:

```
{
  cpuFreq = { lib, ... }: {
    powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
    powerManagement.enable = true;
  };
}
```
 2018-01-28 09:38:45 +01:00
Luke Adams
1537ce9dc7 samba4/sambaMaster: Modify services to align with Samba project usage 2018-01-26 22:37:17 +01:00
Franz Pletz
cb7fe51ee6
nixos/postfix: separate list option elements with commas 2018-01-26 14:10:17 +01:00