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
Franz Pletz
08d3754a89
Merge pull request #34705 from etu/php-upgrade
...
php: 7.1.14 -> 7.2.2
2018-02-13 12:50:45 +00: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
Vladimír Čunát
040bde9052
Merge #34866 : nixos doc: efficient comparisons
...
This solves most of the performance regression from a7d75ab
(#33898 ).
2018-02-12 08:31:43 +01:00
Profpatsch
b806863a82
jid: remove package
2018-02-12 06:23:33 +01:00
Jan Malakhovski
b468f98b02
nixos: doc: trivial cleanup and docstring fix
2018-02-11 22:41:06 +00:00
Franz Pletz
54c7ca34c4
nixos/testing: use the same qemu in the test driver
...
The qemu_test package is also used for running a NixOS qemu VM.
2018-02-11 23:40:54 +01:00
Franz Pletz
74736f26c2
bird2: init at 2.0.1
2018-02-11 23:35:05 +01:00
Jan Malakhovski
252ec7da0a
nixos: doc: make option sorting somewhat more efficient
2018-02-11 22:07:11 +00:00
Tuomas Tynkkynen
48f3036e87
Merge remote-tracking branch 'upstream/master' into staging
2018-02-11 02:10:02 +02: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
c6bd88155e
Merge pull request #34518 from aneeshusa/document-default-kerberos-in-openssh
...
openssh: Document default Kerberos support
2018-02-10 11:31:35 +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
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
Graham Christensen
94e62d505f
Merge pull request #34778 from oxij/os/allow-pkgs
...
nixos: export packages of the current configuration
2018-02-09 20:23:30 -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
Jan Malakhovski
660806066a
nixos, lib: implement relatedPackages option
...
This allows one to specify "related packages" in NixOS that get rendered into
the configuration.nix(5) man page. The interface philosophy is pretty much
stolen from TeX bibliography.
See the next several commits for examples.
2018-02-09 19:51:06 +00:00
Jan Malakhovski
a7d75ab648
nixos/doc: push all the enable*' and
package*` options to the top of their option group
...
Why? Because this way configuration.nix(5) can be read linearly.
Before:
> virtualisation.xen.bootParams
> ...
> virtualisation.xen.enable
> ...
> virtualisation.xen.package
> ...
After:
> virtualisation.xen.enable
> virtualisation.xen.package
> virtualisation.xen.bootParams
> ...
2018-02-09 19:51:05 +00:00
Jan Malakhovski
e1b1683981
nixos: export packages of the current configuration (its pkgs
argument)
...
Allows one to access a package configured with overrides given in `nixpkgs.config`, e.g.:
nix-build ./nixos/default.nix -A pkgs.ffmpeg
2018-02-09 19:35:27 +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
symphorien
0146074560
nixos/tests: add predictable-interface-names.nix ( #34305 )
2018-02-09 18:40:39 +00:00
Robert Hensing
209f8b1acd
nixos/release*.nix: Clean nixpkgs sources by default
...
Currently, when building NixOS from a git clone, Nix has to copy
the entire repo at >1GB into the store by default. That is not
necessary and causes a dumping large path message.
If you need the old behaviour for some reason, you will have to
specify it by passing the path to your repo explicitly as the
nixpkgs argument like this:
--arg nixpkgs '{outPath = ./.; revCount = 56789; shortRev = "gfedcba"; }'
2018-02-09 18:32:26 +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
Graham Christensen
7fb90db696
Merge pull request #34710 from markus1189/doc-vm-login
...
docs: Explain how to login into built vm
2018-02-07 17:43:34 -05:00
sjau
0d65e2e0e5
zfs: add migration path for new crypto format
...
fixes #34559
2018-02-07 20:46:16 +00:00
Markus Hauck
0525e82392
docs: Explain how to login into built vm
2018-02-07 21:34:50 +01:00