Ben Wolsieffer
f413b2bc51
Revert "nixos/kernel.nix: ensure same kernel is used"
...
This reverts commit 78f915a002
.
2021-02-03 20:31:22 -05:00
github-actions[bot]
a93a3ec715
Merge staging-next into staging
2021-02-04 00:35:42 +00:00
Fritz Otlinghaus
05fbc82771
nixos/top-level: add specialisation.<name>.configuration type
2021-02-03 16:27:22 -08:00
Scriptkiddi
5ac119043d
nixos/oauth2_proxy: add extraConfig type
2021-02-03 16:24:36 -08:00
Fritz Otlinghaus
d7ee2a16bd
nixos/resilio: add sharedFolders type
2021-02-03 16:17:37 -08:00
Jan Solanti
0fd29f6ce0
pipewire: move pipewire-media-session to its own output and module
2021-02-03 23:54:32 +02:00
Florian Klink
24bebfa308
Revert "nixos/network-interfaces-systemd: fix IPv6 privacy extensions"
...
This reverts commit d349582c07
.
The workaround initially applied isn't necessary anymore, as 247.3
contains the following commit:
> 242fc1d261 network: fix IPv6PrivacyExtensions=kernel handling
… which fixes https://github.com/systemd/systemd/issues/18003 .
2021-02-03 22:21:19 +01:00
Anderson Torres
8bf1bc692c
Merge pull request #110512 from neosimsim/agda-dont-install-Everything
...
Agda don't install Everything module
2021-02-03 15:56:34 -03:00
Anderson Torres
a27a2c4b15
Merge pull request #110501 from neosimsim/agda-ghc-ieee754
...
agda.withPackages: use GHC with ieee754 as default
2021-02-03 15:55:37 -03:00
github-actions[bot]
571eb10996
Merge staging-next into staging
2021-02-03 18:22:22 +00:00
Jan Solanti
c41cf93b67
pipewire: 0.3.20 -> 0.3.21
2021-02-03 20:18:12 +02:00
Tim Steinbach
0d3bf0781f
scala: Replace VM test with installCheckPhase
2021-02-03 10:24:42 -05:00
Jan Solanti
9de9f6062c
xow: fix service
...
Enable service when services.xow.enable is set to true.
Load xow's modprobe blacklist to make sure the dongle isn't captured by the wrong driver.
2021-02-03 16:18:29 +02:00
github-actions[bot]
8ab0b85ead
Merge staging-next into staging
2021-02-03 12:22:13 +00:00
Jörg Thalheim
5b9bfe5625
zfs: fix invalid package references
2021-02-03 11:45:31 +01:00
Jörg Thalheim
0e784a2a3b
nixos/zfs: fix reference to awk
...
broken in 648a6c4348
2021-02-03 11:43:00 +01:00
Peter Hoeg
c9091a9def
nixos/pykms: fix launcher
2021-02-03 15:59:17 +08:00
github-actions[bot]
f9141c9fc1
Merge staging-next into staging
2021-02-03 00:39:57 +00:00
Jan Solanti
ae89df8fca
pipewire: 0.3.18 -> 0.3.20
2021-02-03 02:16:41 +02:00
Sandro
e9876afb9c
Merge pull request #109414 from rgrunbla/galene
...
galene: init at 0.2
2021-02-02 20:00:09 +01:00
Jan Tojnar
75153ede17
Merge branch 'staging-next' into staging
2021-02-02 19:46:31 +01:00
Felix Tenley
348f2d8e9c
nixos/etebase-server: add NixOS module
2021-02-02 17:13:50 +01:00
Sandro
7c5064e14a
Merge pull request #111153 from helsinki-systems/hadoop
...
nixos/hadoop: add types
2021-02-02 14:14:41 +01:00
Vladimír Čunát
7ca350660d
Merge #111495 : nixosTests.installer: Increase memory for the VM
2021-02-02 14:02:58 +01:00
github-actions[bot]
1d1ce08e2b
Merge staging-next into staging
2021-02-02 12:24:27 +00:00
Jörg Thalheim
57cfa03b03
Merge pull request #111591 from Mic92/zfs-kube
2021-02-02 11:56:58 +00:00
github-actions[bot]
4c1eae9176
Merge staging-next into staging
2021-02-02 00:42:42 +00:00
Sandro
449b698a0b
Merge pull request #111435 from helsinki-systems/sabnzbd
...
nixos/sabnzbd: add types
2021-02-01 20:07:39 +01:00
github-actions[bot]
7044cd0c9d
Merge staging-next into staging
2021-02-01 18:31:04 +00:00
Robert Hensing
a4f4d86e92
Merge pull request #111583 from mikroskeem/more-docker-fixes
...
docker: fix socket activation race
2021-02-01 19:13:38 +01:00
Jörg Thalheim
df3df8c0e0
Merge pull request #111505 from lopsided98/buildbot-python-packages-type
2021-02-01 17:48:51 +00:00
Jörg Thalheim
9c6a9d0458
nixos/lxd: refactor to use zfs.package/enabled property
2021-02-01 17:59:18 +01:00
Jörg Thalheim
63178ae561
nixos/kubernetes: add zfs to path
2021-02-01 17:59:18 +01:00
Jörg Thalheim
ed1f13244b
nixos/zfs: expose enabled option
2021-02-01 17:59:18 +01:00
Jörg Thalheim
648a6c4348
nixos/zfs: expose zfs package as readonly attribute
2021-02-01 17:59:14 +01:00
Fritz Otlinghaus
9b6afb66c7
Revert "nixos/hoogle: add type"
2021-02-01 17:39:08 +01:00
Jan Tojnar
54f4529aec
Merge pull request #111519 from siraben/xdg-utils-naming
2021-02-01 17:18:57 +01:00
Mark Vainomaa
9360e789c6
docker: fix socket activation race
2021-02-01 18:14:43 +02:00
Fritz Otlinghaus
91b0341b53
Revert "nixos/xmonad: add haskellPackages type"
2021-02-01 16:59:07 +01:00
Peter Hoeg
65211f5afc
nixos/hddtemp: add support for HDD/SSD temperature montoring
2021-02-01 23:40:28 +08:00
github-actions[bot]
d2bf5aea5a
Merge staging-next into staging
2021-02-01 12:24:36 +00:00
Sandro
457ff6d28e
Merge pull request #111422 from helsinki-systems/mysqlBackup
...
nixos/mysqlBackup: add types
2021-02-01 12:39:53 +01:00
Sandro
d76eec858c
Merge pull request #111427 from helsinki-systems/postgresql
2021-02-01 12:39:20 +01:00
Attila Lendvai
c61c0cc04f
nixos/bee-clef: init at 0.4.7
2021-02-01 10:56:04 +01:00
Attila Lendvai
35a9d23b82
nixos/bee: init at 0.4.2
2021-02-01 10:56:04 +01:00
Ben Siraphob
a6ac3eedbd
treewide: xdg_utils -> xdg-utils
2021-02-01 15:05:09 +07:00
github-actions[bot]
104c56e909
Merge staging-next into staging
2021-02-01 00:47:02 +00:00
Ben Wolsieffer
945a461ac2
nixos/buildbot: fix type for pythonPackages
...
The pythonPackages option is a function that returns a list of packages, but the
type was specified as just a list of packages.
2021-01-31 17:40:12 -05:00
Ben Wolsieffer
d877c9b39c
nixos/buildbot: add lopsided98 as maintainer
2021-01-31 17:40:11 -05:00
Anders Kaseorg
4a0a7ccb2a
nixosTests.installer: Increase memory allocated to the VM
...
Fixes #111223 .
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2021-01-31 12:45:42 -08:00
github-actions[bot]
03b81d1bef
Merge staging-next into staging
2021-01-31 18:27:42 +00:00
jakobrs
278843e979
nixos/qemu-vm: add virtualisation.msize option
2021-01-31 18:41:22 +01:00
Luflosi
e31dc1c5f6
nginx module: fix typo in proxyWebsockets description
2021-01-31 18:09:41 +01:00
Sandro
2dfbfa3b45
Merge pull request #111438 from helsinki-systems/synergy
...
nixos/synergy: add types
2021-01-31 18:06:36 +01:00
Vincent Haupert
fb3970ef7d
nixos/tests: add kernel-latest-ath-user-regd
...
Test for the option `networking.wireless.athUserRegulatoryDomain` to
make sure the underlying patch still applies for the latest kernel.
Also see NixOS/nixpkgs#108725 .
2021-01-31 10:48:15 -05:00
Sandro
cf17c057b7
Merge pull request #111461 from helsinki-systems/xen
...
nixos/xen: add types
2021-01-31 15:27:37 +01:00
Sandro
a0829b1df8
Merge pull request #111455 from helsinki-systems/yandex
...
nixos/yandex-disk: add types
2021-01-31 15:25:10 +01:00
Sandro
1c71af8fd7
Merge pull request #111454 from helsinki-systems/xtreemfs
...
nixos/xtreemfs: add types
2021-01-31 15:24:55 +01:00
Sandro
a68c03eb14
Merge pull request #111451 from helsinki-systems/xmonad
...
nixos/xmonad: add haskellPackages type
2021-01-31 15:22:06 +01:00
Sandro
4d2b0ebe18
Merge pull request #111450 from helsinki-systems/exwm
...
nixos/exwm: add loadScript type
2021-01-31 15:21:46 +01:00
Sandro
094c85ece5
Merge pull request #111449 from helsinki-systems/xserver
...
nixos/xserver: add serverFlagsSection type
2021-01-31 15:21:34 +01:00
Sandro
79021a2383
Merge pull request #111448 from helsinki-systems/gtk
...
nixos/lightdm-greeters/gtk: add type
2021-01-31 15:21:22 +01:00
Sandro
a6551d1aac
Merge pull request #111446 from helsinki-systems/pantheon
...
nixos/pantheon: add sessionPath type
2021-01-31 15:20:49 +01:00
Sandro
26249e6312
Merge pull request #111445 from helsinki-systems/gnome3
...
nixos/gnome3: add sessionPath type
2021-01-31 15:20:38 +01:00
Sandro
6e2b7d0d77
Merge pull request #111444 from helsinki-systems/cinnamon
...
nixos/cinnamon: add sessionPath type
2021-01-31 15:20:17 +01:00
Sandro
428f2084cf
Merge pull request #111443 from helsinki-systems/weechat
...
nixos/weechat: add binary
2021-01-31 15:19:10 +01:00
Sandro
2c748ee8a4
Merge pull request #111439 from helsinki-systems/unit
...
nixos/unit: add stateDir and logDir types
2021-01-31 15:18:08 +01:00
Sandro
197cfaba57
Merge pull request #111437 from helsinki-systems/svnserve
...
nixos/svnserve: add svnBaseDir type
2021-01-31 15:17:24 +01:00
Sandro
4bb7e4fb63
Merge pull request #111470 from helsinki-systems/bind2
...
nixos/bind: update zone file type
2021-01-31 15:14:02 +01:00
Sandro
75281960c0
Merge pull request #111436 from helsinki-systems/shairport
...
nixos/shairport-sync: add types
2021-01-31 15:13:33 +01:00
Sandro
f6b78c163c
Merge pull request #111433 from helsinki-systems/rippled
...
nixos/rippled: add extraConfig type
2021-01-31 15:12:52 +01:00
Fritz Otlinghaus
929bf6e678
nixos/postgresqlBackup: add types
2021-01-31 15:08:12 +01:00
Fritz Otlinghaus
b9d5ecf80b
nixos/mysqlBackup: add types
2021-01-31 15:06:50 +01:00
Sandro
1b77b735ea
Merge pull request #111428 from helsinki-systems/prayer
...
nixos/prayer: Add port type
2021-01-31 15:05:59 +01:00
Sandro
cc80d6d5d4
Merge pull request #111425 from helsinki-systems/openafs
...
nixos/openafs: add types
2021-01-31 15:05:21 +01:00
Sandro
53f4c40d39
Merge pull request #111424 from helsinki-systems/nginx
...
nixos/nginx: add logError type
2021-01-31 15:05:02 +01:00
Sandro
ab61ee3563
Merge pull request #111423 from helsinki-systems/netatalk
...
nixos/netatalk: add types
2021-01-31 15:04:52 +01:00
Sandro
5008c20426
Merge pull request #111421 from helsinki-systems/mediawiki
...
nixos/mediawiki: add name type
2021-01-31 15:04:14 +01:00
Sandro
49f5e8799b
Merge pull request #111420 from helsinki-systems/mailpile
...
nixos/mailpile add types switch port to port type
2021-01-31 15:04:01 +01:00
Sandro
60b597ad3b
Merge pull request #111419 from helsinki-systems/lshd
...
nixos/lshd: add types
2021-01-31 15:03:45 +01:00
Sandro
0fc3bc21ab
Merge pull request #111418 from helsinki-systems/k3s
...
nixos/k3s: add extraFlags type
2021-01-31 15:02:31 +01:00
Sandro
af78f11035
Merge pull request #111417 from helsinki-systems/ircd-hybrid
...
nixos/ircd-hybrid: add types
2021-01-31 15:02:07 +01:00
Fritz Otlinghaus
58ab3a3249
nixos/bind: update zone file type
2021-01-31 14:59:54 +01:00
Fritz Otlinghaus
54e7528009
nixos/radvd: add type ( #111430 )
2021-01-31 13:54:30 +01:00
Fritz Otlinghaus
8de8e40d64
nixos/postfix: add types ( #111426 )
2021-01-31 13:52:46 +01:00
Fritz Otlinghaus
d7c39c01ae
nixos/xen: add types
2021-01-31 13:47:57 +01:00
Fritz Otlinghaus
821f19a975
nixos/quassel: add types ( #111429 )
2021-01-31 13:46:29 +01:00
Lassulus
4c181d179b
Merge pull request #110131 from helsinki-systems/bind_types
...
bind: Add types for options
2021-01-31 13:44:14 +01:00
Fritz Otlinghaus
4e353723d6
nixos/unit: add stateDir and logDir types
2021-01-31 13:41:53 +01:00
Fritz Otlinghaus
9489f3450c
nixos/xtreemfs: add types
2021-01-31 13:23:26 +01:00
github-actions[bot]
19d5413d37
Merge staging-next into staging
2021-01-31 12:23:21 +00:00
Fritz Otlinghaus
3ecf072d9b
nixos/yandex-disk: add types
2021-01-31 13:10:20 +01:00
Fritz Otlinghaus
1bf9ebc8b2
nixos/weechat: add binary
2021-01-31 12:59:04 +01:00
Fritz Otlinghaus
37f575cd7e
nixos/xmonad: add haskellPackages type
2021-01-31 12:57:14 +01:00
Fritz Otlinghaus
234f4fe5c4
nixos/exwm: add loadScript type
2021-01-31 12:55:40 +01:00
Fritz Otlinghaus
8f261f1552
nixos/xserver: add serverFlagsSection type
2021-01-31 12:53:41 +01:00
Fritz Otlinghaus
c44f508e3e
nixos/lightdm-greeters/gtk: add type
2021-01-31 12:41:17 +01:00
Fritz Otlinghaus
1307b605d7
nixos/gnome3: add sessionPath type
2021-01-31 12:40:13 +01:00
Fritz Otlinghaus
ccd2965c70
nixos/pantheon: add sessionPath type
2021-01-31 12:39:07 +01:00
Fritz Otlinghaus
b9f972a5d8
nixos/cinnamon: add sessionPath type
2021-01-31 12:36:30 +01:00
Kevin Cox
969e43e394
Merge pull request #95406 from Mic92/mountpoint-type
...
nixos/filesystems: don't allow mountpoints with trailing slash
2021-01-31 06:28:02 -05:00
Fritz Otlinghaus
3fc73679c0
nixos/synergy: add types
2021-01-31 12:17:41 +01:00
Fritz Otlinghaus
02c592efff
nixos/svnserve: add svnBaseDir type
2021-01-31 12:15:45 +01:00
Fritz Otlinghaus
a94c7ef24e
nixos/shairport-sync: add types
2021-01-31 12:14:01 +01:00
Fritz Otlinghaus
14a8446dc1
nixos/sabnzbd: add types
2021-01-31 12:12:59 +01:00
Fritz Otlinghaus
c3edcddb5e
nixos/rippled: add extraConfig type
2021-01-31 12:10:14 +01:00
Fritz Otlinghaus
f0932a6c41
nixos/prayer: Add port type
2021-01-31 12:01:41 +01:00
Fritz Otlinghaus
b0113ee268
nixos/openafs: add types
2021-01-31 11:56:52 +01:00
Fritz Otlinghaus
a55d0b80ff
nixos/nginx: add logError type
2021-01-31 11:37:38 +01:00
Fritz Otlinghaus
74cfc4d692
nixos/netatalk: add types
2021-01-31 11:31:24 +01:00
Fritz Otlinghaus
e67b6193aa
nixos/mediawiki: add name type
2021-01-31 11:28:04 +01:00
Fritz Otlinghaus
295de63e90
nixos/lshd: add types
2021-01-31 11:27:20 +01:00
Fritz Otlinghaus
f50a26d257
nixos/mailpile add types switch port to port type
2021-01-31 11:26:07 +01:00
Fritz Otlinghaus
3c7c9a43dc
nixos/k3s: add extraFlags type
2021-01-31 11:21:54 +01:00
Fritz Otlinghaus
adacfb44cc
nixos/ircd-hybrid: add types
2021-01-31 11:17:03 +01:00
github-actions[bot]
f92395cf3c
Merge staging-next into staging
2021-01-31 06:19:43 +00:00
John Ericson
6717246373
Merge pull request #111284 from siraben/remove-new-stdenv-lib
...
stdenv: warn about use of inherited lib
2021-01-30 22:28:05 -05:00
Dmitry Kalinkin
8468a9878c
Merge pull request #87856 from eadwu/kernel/same-kernel
...
nixos/kernel.nix: ensure same kernel is used
2021-01-30 22:13:02 -05:00
Dmitry Kalinkin
efda1be800
Merge pull request #99314 from eadwu/clight/fix-config-file
...
nixos/clight: fix config file generation
2021-01-30 22:10:13 -05:00
Dmitry Kalinkin
161b9b2436
Merge pull request #99323 from eadwu/nvidia/hardware.nvidia.package
...
nixos: hardware.nvidia.package option for selecting nvidia package
2021-01-30 22:08:37 -05:00
Elias Probst
27da11972d
nixos/restic: correct location of cache directory
...
By default, restic determines the location of the cache based on the XDG
base dir specification, which is `~/.cache/restic` when the environment
variable `$XDG_CACHE_HOME` isn't set.
As restic is executed as root by default, this resulted in the cache being
written to `/root/.cache/restic`, which is not quite right for a system
service and also meant, multiple backup services would use the same cache
directory - potentially causing issues with locking, data corruption,
etc.
The goal was to ensure, restic uses the correct cache location for a
system service - one cache per backup specification, using `/var/cache`
as the base directory for it.
systemd sets the environment variable `$CACHE_DIRECTORY` once
`CacheDirectory=` is defined, but restic doesn't change its behavior
based on the presence of this environment variable.
Instead, the specifier [1] `%C` can be used to point restic explicitly
towards the correct cache location using the `--cache-dir` argument.
Furthermore, the `CacheDirectoryMode=` was set to `0700`, as the default
of `0755` is far too open in this case, as the cache might contain
sensitive data.
[1] https://www.freedesktop.org/software/systemd/man/systemd.unit.html#Specifiers
2021-01-30 18:24:51 -08:00
Vincent Haupert
730da50f85
nixos/tests: adapt systemd-networkd-ipv6-prefix-delegation
2021-01-31 01:49:24 +01:00
github-actions[bot]
81337921f5
Merge staging-next into staging
2021-01-31 00:46:33 +00:00
Sandro
fccda5aae6
Merge pull request #108819 from SuperSandro2000/nginx-module
2021-01-30 21:46:35 +01:00
github-actions[bot]
c72ffa864a
Merge staging-next into staging
2021-01-30 18:27:30 +00:00
Guillaume Girol
04af7c02cd
Merge pull request #108725 from veehaitch/ath_regd_optional
...
kernelPatches: ath driver: allow setting regulatory domain
2021-01-30 14:07:25 +00:00
Vincent Haupert
e6660ffe7f
nixos/networkd: rename ipv6PrefixDelegationConfig option to ipv6SendRAConfig
...
networkd's [IPv6PrefixDelegation] section and IPv6PrefixDelegation=
options have been renamed as [IPv6SendRA] and IPv6SendRA= in systemd
247.
Throws if the deprecated option ipv6PrefixDelegationConfig is used.
2021-01-30 14:54:11 +01:00
Ben Siraphob
0fa4858791
release-notes/rl-2103: mention deprecation of stdenv.lib
2021-01-30 20:26:37 +07:00
Vincent Haupert
735111487b
nixos/networkd: add ipv6AcceptRAConfig option
...
Adds `systemd.network.networks.*.ipv6AcceptRAConfig` for networkd's
[IPv6AcceptRA] section.
2021-01-30 14:06:44 +01:00
Vincent Haupert
38f19af769
nixos/networkd: add dhcpV6PrefixDelegationConfig option
...
networkd gained a new section [DHCPv6PrefixDelegation] which
controls delegated prefixes assigned by DHCPv6 client. Added in systemd
246.
2021-01-30 14:06:27 +01:00
Dustin Frisch
891d1aa885
nixos/nginx: serve unknown MIME-Types as binary
...
The built-in default for unknown MIME-Types is `text/plain` whereas the
upstream default config changes it to `application/octet-stream`. By
changing the default tpye, unknown files will be downloaded by browsers
instead of being displayed.
2021-01-30 12:52:02 +01:00
Vincent Haupert
53033aaf5a
nixos/networkd: add missing dhcpV6Config options
2021-01-30 12:50:22 +01:00
github-actions[bot]
2c6ca9ac8a
Merge staging-next into staging
2021-01-30 06:19:36 +00:00
Silvan Mosberger
45a7914186
Merge pull request #109035 from turion/dev_nextcloud_php
...
Nextcloud: Add phpExtraExtensions
2021-01-30 02:41:13 +01:00
Sandro
548dc3cc62
Merge pull request #111125 from helsinki-systems/gocd-agent
...
nixos/gocd-agent nixos/gocd-server: add types
2021-01-30 02:22:03 +01:00
github-actions[bot]
e788d512e8
Merge staging-next into staging
2021-01-30 00:44:04 +00:00
Maximilian Bosch
454da6cd6b
Merge pull request #110871 from rnhmjoj/dnscrypt
...
nixos/test/dnscrypt-wrapper: fix test
2021-01-29 20:34:56 +01:00
Silvan Mosberger
aa48e205a2
Merge pull request #110787 from tfc/cartesian-product
...
lib/attrsets: add cartesianProductOfSets function
2021-01-29 20:22:12 +01:00
github-actions[bot]
9123d48a15
Merge staging-next into staging
2021-01-29 18:31:09 +00:00
Florian Klink
dfb2bc857b
nixos/acme: fix docs
2021-01-29 18:56:28 +01:00
Svein Ove Aas
c9f8884592
nVidia: Support dynamic (fine-grained) power management
2021-01-29 12:55:51 -05:00
Svein Ove Aas
6021ab7820
nvidia: Add AMD APU option for Prime
2021-01-29 12:55:51 -05:00
adisbladis
d25c7c1450
Merge pull request #111033 from szlend/fix-oci-containers-service-depends
...
nixos/oci-containers: Remove dependency on system.path
2021-01-29 18:35:49 +01:00
Simon Žlender
ede24160fc
nixos/oci-containers: Remove dep on system.path
2021-01-29 18:29:07 +01:00
Sandro
532dd98cdb
Merge pull request #111155 from helsinki-systems/hostapd
...
nixos/hostapd: add interface type
2021-01-29 17:47:39 +01:00
Sandro
32fb3b7bc3
Merge pull request #111154 from helsinki-systems/hoogle
...
nixos/hoogle: add type
2021-01-29 17:47:26 +01:00
Matthew Bauer
6307346fd9
Merge pull request #98858 from sorki/cross/rpifw
...
raspberrypi-builder: allow passing firmware package as argument
2021-01-29 10:21:32 -06:00
Florian Klink
82102fc37d
Merge pull request #100356 from m1cr0man/docsupdate
...
nixos/acme: Docs, explain how to set permissions
2021-01-29 17:16:06 +01:00
WORLDofPEACE
3eae73d862
Merge pull request #97618 from lf-/fix-bad-caddy-configs
...
nixos/caddy: fix overwriting of tls settings in config
2021-01-29 10:08:46 -05:00
Anderson Torres
79256619ce
Merge pull request #108294 from GovanifY/silent-boot
...
boot.initrd: add verbose option
2021-01-29 11:56:20 -03:00
github-actions[bot]
c367646dd4
Merge staging-next into staging
2021-01-29 12:23:58 +00:00
Scriptkiddi
679e369ba2
nixos/hostapd: add interface type
2021-01-29 13:04:50 +01:00
Scriptkiddi
3f41fbc8e8
nixos/hoogle: add type
2021-01-29 13:03:37 +01:00
Scriptkiddi
0cbbc2dfcd
nixos/hadoop: add types
2021-01-29 13:01:42 +01:00
Scriptkiddi
c1b25f2529
nixos/gocd-agent nixos/gocd-server: add types
2021-01-29 12:59:55 +01:00
Gabriel Gonzalez
80f6769ebc
Don't createHome
for the hydra
user ( #110722 )
...
Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
2021-01-29 09:22:49 +00:00
Sandro
1f730f2918
Merge pull request #111126 from helsinki-systems/gogoclient
...
nixos/gogoclient: add types
2021-01-29 09:52:35 +01:00
Scriptkiddi
5f40e68c9c
nixos/consul: add types
2021-01-29 00:32:32 -08:00
Scriptkiddi
f2764e1f71
nixos/gogoclient: add types
2021-01-29 08:39:51 +01:00
Jörg Thalheim
e5ce05cc1e
Merge pull request #67493 from clefru/make-disk-image
2021-01-29 07:18:50 +00:00
github-actions[bot]
3ac0ccda7a
Merge staging-next into staging
2021-01-29 00:43:57 +00:00
Jacek Galowicz
001ba3934e
Use lib.cartesianProducOfSets where lib.crossLists was used
2021-01-28 23:49:05 +01:00
Scriptkiddi
624b5608c4
nixos/deluge: add type
2021-01-28 14:30:23 -08:00
Scriptkiddi
1d22f05d64
nixos/fprot: add type
2021-01-28 14:12:15 -08:00
Scriptkiddi
103ea99b99
nixos/gvpe: add types
2021-01-28 13:58:33 -08:00
Simon Žlender
683f0b8938
nixos/oci-containers: Use docker.package
2021-01-28 21:27:50 +01:00
github-actions[bot]
798f7b136c
Merge staging-next into staging
2021-01-28 18:30:08 +00:00
Marijan Petričević
f56089ded5
nixos/hledger-web: init module and test
2021-01-28 15:29:53 +01:00
github-actions[bot]
2e78c8c736
Merge staging-next into staging
2021-01-28 12:23:55 +00:00
Matthias Treydte
7d2829c0a0
nixos/nginx: fix MemoryDenyWriteExecute not being disabled when needed
...
The expression should check if the actually used nginx package
needes write+execute rights, not the default pkgs.nginx (which
has no modules unless overridden in an overlay).
Having MemoryDenyWriteExecute always true causes e.g. the Lua
module to fail (because JIT compilation).
2021-01-28 13:13:31 +01:00
Emery Hemingway
f32d7e4e03
nixos: add services.rsyncd.socketActivated option
...
Define systemd-socket activation using the upstream configuration
files as a reference. The "rsyncd" systemd unit has been renamed
to "rsync" for consistency with upstream.
2021-01-28 11:22:31 +01:00
github-actions[bot]
eedadbb22b
Merge staging-next into staging
2021-01-28 00:45:34 +00:00
Scriptkiddi
f697a31b93
nixos/elasticsearch-curator: add type
2021-01-27 11:50:19 -08:00
Scriptkiddi
f8236681be
nixos/felix: add types
2021-01-27 11:44:59 -08:00
Scriptkiddi
f2ce0f543d
nixos/flashpolicyd: add types
2021-01-27 11:44:15 -08:00
github-actions[bot]
06efb52369
Merge staging-next into staging
2021-01-27 18:28:34 +00:00
Erik Arvstedt
0b5fd3b784
qemu-guest: remove security.rngd setting
...
Since release 20.09 `rngd.enable` defaults to false, so this setting is redundant.
Also fix the `qemu-quest` section of the manual that incorrectly claimed
that `rngd` was enabled.
2021-01-27 18:27:34 +01:00
Sandro
b237f724fc
Merge pull request #110799 from helsinki-systems/dysnomia_drop
...
nixos/disnix nixos/dysnomia: drop modules
2021-01-27 17:53:59 +01:00
Florian Klink
1030745555
Merge pull request #106857 from m1cr0man/master
...
nixos/acme: Fixes for account creation and remove tmpfiles usage
2021-01-27 17:52:16 +01:00
Jörg Thalheim
0998756db2
Merge pull request #109342 from Mic92/wrappers
2021-01-27 14:32:38 +00:00
Ninjatrappeur
ab224b550c
Merge pull request #103138 from NinjaTrappeur/nin-pleroma
2021-01-27 13:28:44 +01:00
github-actions[bot]
1b5da764a7
Merge staging-next into staging
2021-01-27 12:24:09 +00:00
Scriptkiddi
a3f4db8679
nixos/dysnomia nixos/disnix: Drop modules
2021-01-27 11:27:09 +01:00
Manuel Bärenz
0ff63a3fa6
nixos/nextcloud: Conditionally enable caching PHP extensions
2021-01-27 11:05:08 +01:00
Manuel Bärenz
6cf2b5466d
nixos/nextcloud: add documentation for phpExtraExtensions option
2021-01-27 11:05:07 +01:00
Aaron Andersen
f72c123b6e
nixos/nextcloud: remove duplicate php.ini entries
2021-01-27 11:05:07 +01:00
Aaron Andersen
434a2783b8
nixos/nextcloud: add phpExtraExtensions option
2021-01-27 11:05:00 +01:00
Robert Hensing
d2a41be2f3
Merge pull request #110707 from Infinisil/functionTo
...
Bring back `types.functionTo`
2021-01-27 10:50:13 +01:00
Sandro
2ee93d61ad
Merge pull request #110913 from siraben/other-stdenv-lib
2021-01-27 10:13:05 +01:00
github-actions[bot]
237005ed2d
Merge staging-next into staging
2021-01-27 06:19:32 +00:00
Ben Siraphob
36c91cea1d
treewide: stdenv.lib -> lib
2021-01-27 13:08:40 +07:00
Scriptkiddi
26c4dcf8fa
nixos/babeld: add type extraConfig
2021-01-26 20:06:29 -08:00
github-actions[bot]
0f779d50b1
Merge staging-next into staging
2021-01-27 00:43:23 +00:00
WORLDofPEACE
ebc22e9921
Merge pull request #93372 from bb2020/oss
...
nixos/alsa: disable OSSEmulation by default
2021-01-26 19:39:42 -05:00
Scriptkiddi
5f472181f2
nixos/cntlm: add types
2021-01-26 13:17:19 -08:00
rnhmjoj
0b4d5b741b
nixos/test/dnscrypt-wrapper: fix test
...
The test was broken by the inclusion of the default dnscrypt-proxy
configuration in e4c49db6
.
2021-01-26 19:17:30 +01:00
Félix Baylac-Jacqué
60b730fd94
nixos/pleroma: add NixOS VM test.
2021-01-26 18:11:38 +01:00
Félix Baylac-Jacqué
231c5a576a
nixos/pleroma: init
...
Adding a new pleroma NixOS module and its associated documentation.
co-authored-by: duponin <duponin@locahlo.st>
2021-01-26 18:11:38 +01:00
Jan Tojnar
4709dce995
Merge branch 'staging-next' into staging
2021-01-26 13:54:54 +01:00
bb2020
603e14c793
nixos/alsa: disable OSSEmulation by default
...
OSS Emulation is considered incomplete so disabling it by default.
Using user level alsa-oss library (nix-env -iA nixos.alsaOss) over
this kernel module is recommended.
2021-01-26 15:06:33 +03:00
Julien Moutinho
39a5e2c76b
nixos/freeciv: init
2021-01-26 12:33:59 +01:00
Fritz Otlinghaus
d40f7dcb31
nixos/cgminer: add types
2021-01-26 12:24:48 +01:00
github-actions[bot]
8aeb21f8cb
Merge staging-next into staging
2021-01-26 00:45:15 +00:00
misuzu
1e38f0bdf9
nixos/gitlab-runner: add support for 'docker+machine' and 'docker-ssh+machine' executors ( #108763 )
2021-01-26 00:01:54 +00:00
Sandro
896a3428ec
Merge pull request #110444 from helsinki-systems/bacula_types
...
nixos/bacula: adding types to all options
2021-01-26 00:51:18 +01:00
github-actions[bot]
a008c42d22
Merge staging-next into staging
2021-01-25 18:52:12 +00:00
John Ericson
e34a53c4ea
Merge pull request #110803 from Ericson2314/fix-nixos-misc-linux-config
...
nixos treewide: Fix references to linux-kernel.target
2021-01-25 13:39:20 -05:00
John Ericson
63b02e55db
nixos treewide: Fix references to linux-kernel.target
...
Thanks @ajs124 in
https://github.com/NixOS/nixpkgs/pull/110544#discussion_r563828722 for
catching this. According to:
git grep 'inherit.*Platform.*platform'
git grep ' linux-kernel'
We now don't have any remaining problems of this sort, thankfully.
2021-01-25 13:06:12 -05:00
Fritz Otlinghaus
41f4784e65
bacula: add types
2021-01-25 19:00:01 +01:00
Matthew Bauer
e8338c9c1d
Merge pull request #110739 from matthewbauer/fix-binfmt-nix-sandbox
...
nixos/binfmt: add bash to sandboxPaths
2021-01-25 11:53:27 -06:00
Florian Klink
b2f3bd4d79
Merge pull request #100155 from primeos/nixos-add-fqdn-option
...
nixos/networking: Add a read-only option for the FQDN
2021-01-25 16:45:45 +01:00
Aamaruvi Yogamani
30b4f71c15
nixos/auto-cpufreq: init module
2021-01-25 09:24:07 -05:00
talyz
dd6ebb7871
google-compute-config: Reintroduce fetch-ssh-keys
...
Reintroduce the `fetch-ssh-keys` service so that GCE images that work
with NixOps can once again be built. Also, reformat the code a bit.
The service was removed in 88570538b3
,
likely due to a comment saying it should be removed. It was still
needed for images to work with NixOps, however, and probably needed to
be replaced or rewritten rather than removed.
2021-01-25 14:14:00 +01:00
rnhmjoj
f62d2652e2
nixos/uwsgi: set up the default runtime directory
...
Fix issue #110691
2021-01-25 14:05:39 +01:00
rnhmjoj
4ff48ea01c
nixos/tests/searx: fix build
...
yq-go has been updated with breaking changes to the syntax.
2021-01-25 12:11:59 +01:00
Jörg Thalheim
76360c005f
nixos/filesystems: don't allow mountpoints with trailing slash
...
They are semantically the same as the non-slash version and therefore
are potential source of duplicates.
Also fixes https://github.com/NixOS/nixpkgs/issues/78951
Alternative to https://github.com/NixOS/nixpkgs/pull/95308
2021-01-25 11:10:03 +01:00
Matthew Bauer
35bd8f1153
nixos/binfmt: add bash to sandboxPaths
...
bash is needed to run the new binfmt shell script.
Fixes #110540
2021-01-24 22:47:59 -06:00
github-actions[bot]
c564d1e1ce
Merge staging-next into staging
2021-01-25 01:18:29 +00:00
Sandro
a36bf6faf9
Merge pull request #101796 from luc65r/pkg/tilp2
2021-01-25 01:11:50 +01:00
Yorick van Pelt
9df9c1992b
beam-packages: move wxSupport arg up to package set, add beam_nox
...
This allows us to override the erlang wxSupport argument globally from
an overlay, fixing builds for e.g. rabbitmq with noXlibs set.
2021-01-24 21:04:52 +01:00
Vladimír Čunát
fe111fc679
nixosTests.zfs.installer: fixup test after d44c6219b8
2021-01-24 21:02:56 +01:00
Jan Tojnar
3c5dff210a
Merge branch 'staging-next' into staging
2021-01-24 20:43:48 +01:00
Michael Weiss
27955d37e9
nixos/tests/chromium: Simplify the logic ( #110715 )
...
- Improve the documentation (Python docstrings for functions and more
meaningful xdotool script names).
- Make more use of the existing methods (e.g. wait_until_succeeds(), and
send_key())
- Note: This increases timeouts from 60 seconds to (currently)
15 minutes but the defaults from test-driver.py should be fine.
This should make it simpler to read the code, understand the test
output, and drop the custom xdotool scripts in the future.
2021-01-24 20:35:29 +01:00
Sheena Artrip
52fc21b10f
command-not-found: fix zsh exit code
2021-01-24 20:14:16 +01:00
Bernardo Meurer
105b9eb1b8
Merge pull request #109768 from cpcloud/nomad-datadir-cleanup
...
nixos/nomad: enforce specific data_dir semantics
2021-01-24 18:20:08 +00:00
Alexander Ben Nasrallah
226299e1a2
agdaPackages.mkDerivation: don't install Everything module
...
The Everthing module is not part of a library and should therefore
not be copied to the nix store.
This is particularly bad, if the Everything module is defined in
an agda library included directory, e.g. consider an agda-lib with
include: .
and Everything.agda in the project root (.), in which case the
Everything module would become part of the library.
If multiple such projects are in the dependency tree, the Everything
module becomes ambiguous and the build would fail.
2021-01-24 17:30:01 +01:00
Bas van Dijk
8ac4b251c8
nixos: use functionTo to prevent evaluation errors while merging
...
Without this patch merging options like
services.xserver.windowManager.xmonad.extraPackages
results in the evaluation error:
error: value is a list while a set was expected, at nixpkgs/lib/options.nix:77:23
With this patch we get the desired merging behaviour that just concatenates the
resulting package lists.
(cherry picked from commit 6e99f9fdec
)
Co-Authored-By: Silvan Mosberger <contact@infinisil.com>
2021-01-24 17:18:37 +01:00
Sandro
81e3b9d15b
Merge pull request #110670 from siraben/double-quotes-fix
...
treewide: fix double quoted strings in one-liners
2021-01-24 16:17:14 +01:00
Michael Weiss
9e9e240a27
Revert "release-combined.tested: Temporarily remove the Chromium test"
...
This reverts commit 2dbd08dcbd
.
I've fixed the regression in 8a7a8442c1
and the rest of my
refactorings/improvements shouldn't affect the stability of the test.
2021-01-24 15:27:49 +01:00
Alexander Ben Nasrallah
67e43b7453
nixos/tests/agda: check execution of HelloWorld
...
Test that the compiled executable actually runs.
2021-01-24 15:02:16 +01:00
Kim Lindberger
2632551494
Merge pull request #110689 from talyz/fish-foreign-env-function-path
...
nixos/fish: Fix foreign-env function path
2021-01-24 14:37:08 +01:00
Sandro
0dd579a3e6
Merge pull request #110686 from helsinki-systems/chrony_types
...
nixos/chrony: add types
2021-01-24 14:18:51 +01:00
luc65r
1900b6e2d7
nixos/tilp2: init
2021-01-24 14:06:42 +01:00
volth
bc0d605cf1
treewide: fix double quoted strings in meta.description
...
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
2021-01-24 19:56:59 +07:00
Sandro
513a3ea665
Merge pull request #110680 from helsinki-systems/amuled_types
2021-01-24 13:52:02 +01:00
Fritz Otlinghaus
31345193f0
nixos/chrony: add types
2021-01-24 13:50:35 +01:00
Robert Hensing
530df49d7a
Merge pull request #108411 from hercules-ci/vault-multiple-config-files
...
vault: Support multiple config files (no secrets in store)
2021-01-24 13:49:06 +01:00
Sandro
0a81d0846a
Merge pull request #110682 from helsinki-systems/buildbot_types
...
nixos/buildbot: add pythonPackages type
2021-01-24 13:45:05 +01:00
talyz
6230ff7dd8
nixos/fish: Fix foreign-env function path
2021-01-24 13:41:37 +01:00
Fritz Otlinghaus
6054aa2bc1
nixos/amuled: add types
2021-01-24 13:37:09 +01:00
Fritz Otlinghaus
72691e14ec
nixos/buildbot: add pythonPackages type
2021-01-24 13:20:35 +01:00
Fritz Otlinghaus
91311fcb46
nixos/autofs: add timeout type
2021-01-24 13:17:07 +01:00
rnhmjoj
cc8a4227c1
nixos/tests/custom-ca: init
...
This is a NixOS test for the security.pki options.
2021-01-24 10:50:56 +01:00
Gauvain 'GovanifY' Roussel-Tarbouriech
bc1b5fdfe0
boot.initrd: add verbose option
2021-01-24 07:16:21 +01:00
Attila Lendvai
21c56fc3cf
nixos/doc/manual: In the preface, add link to #chap-contributing
...
Turned the freetext suggestion about opening the build output
into a copy-pastable xdg-open line.
Renamed title to 'Contributing to this manual'.
2021-01-23 18:58:54 -08:00
Sandro
77f32f2f3c
Merge pull request #110628 from prusnak/stdenv-lib
...
treewide: stdenv.lib -> lib
2021-01-24 03:10:32 +01:00
Sandro
51ea855376
Merge pull request #109735 from berberman/fcitx5-mozc
2021-01-24 02:47:37 +01:00
Potato Hatsue
e8ffe04c79
fcitx5: update doc
2021-01-24 02:10:23 +01:00
Pavol Rusnak
90f7338112
treewide: stdenv.lib -> lib
2021-01-24 01:49:49 +01:00
Phillip Cloud
c7c3b9e4ae
nixos/nomad: remove User setting entirely
2021-01-23 19:44:37 -05:00
Phillip Cloud
2a3cb407b0
nixos/nomad: only set User if privileges are dropped
2021-01-23 19:44:37 -05:00
Phillip Cloud
de71f5b506
nixos/tests: add test for custom nomad state directory
2021-01-23 19:44:37 -05:00
Phillip Cloud
5ce4ce6174
nixos/nomad: make formatting consistent in mkMerge call
2021-01-23 19:44:37 -05:00
Phillip Cloud
12b9249cf3
nixos/nomad: unconditionally set user to nomad
2021-01-23 19:44:37 -05:00
Phillip Cloud
5d0b3b7228
nixos/nomad: fix markup and remove suggestion
2021-01-23 19:44:37 -05:00
Phillip Cloud
bddb7ac406
nixos/nomad: fix typo and spell out ExecStartPre usage
2021-01-23 19:44:37 -05:00
Phillip Cloud
b72a46713f
nixos/nomad: reformat SupplementaryGroups expression
2021-01-23 19:44:37 -05:00
Phillip Cloud
b80c454459
nixos/nomad: add mkIf for StateDirectory
2021-01-23 19:44:37 -05:00
Phillip Cloud
58fe45936e
nixos/nomad: move serviceConfig into mkMerge and mkIf for docker SupplementaryGroups
2021-01-23 19:44:37 -05:00
Phillip Cloud
f3aa71b7ec
nixos/nomad: describe the nomad cluster manager responsibilities
2021-01-23 19:44:37 -05:00
Phillip Cloud
3e00482ba8
nixos/nomad: add assertion for the value of dropPrivileges and its relation to data_dir
2021-01-23 19:44:37 -05:00
Phillip Cloud
f1778cd90e
nixos/nomad: add extraSettingsFiles option to nomad service ( #109761 )
2021-01-23 23:52:19 +01:00
markuskowa
2f34b4b883
Merge pull request #108983 from markuskowa/dev-mpi
...
Use mpi attribute consistently to provide a default MPI implementation
2021-01-23 22:51:09 +01:00
John Ericson
12881a7aa7
Merge pull request #110544 from Ericson2314/no-platform
...
top-level, lib: Remove platform attribute of platforms
2021-01-23 16:32:36 -05:00
tv
530d3ffbcc
nixos/users: use proper name for per-user packages
...
Fixes #107353
2021-01-23 21:36:14 +01:00
Phillip Cloud
2861d26df5
nixos/nomad: move data_dir default setting to allow propagation of default
2021-01-23 12:50:01 -05:00
Phillip Cloud
0bbed1c273
nixos/nomad: add newline
2021-01-23 12:50:01 -05:00
Jörg Thalheim
17da58acca
Merge pull request #108242 from GovanifY/grub-additional
...
boot.loader.grub: add extraInstallCommands option
2021-01-23 16:18:22 +00:00
John Ericson
9c213398b3
lib: Clean up how linux and gcc config is specified
...
Second attempt of 8929989614589ee3acd070a6409b2b9700c92d65; see that
commit for details.
This reverts commit 0bc275e634
.
2021-01-23 10:01:28 -05:00
Michael Weiss
237c20ac61
nixos/smokeping: Replace the tabs in cfg.targetConfig
...
This was inconsistent with the rest of the module.
2021-01-23 14:03:16 +01:00
Michael Weiss
87fb5d381f
nixos/smokeping: Add a PoC for using networking.fqdn
2021-01-23 14:03:16 +01:00
Michael Weiss
86897c8f63
nixos/tests/chromium: Fix another potential race condition
...
The create_new_win() function could open multiple windows when used
incorrectly. This change makes sure that a new window will only be
created if the main window could be selected successfully.
This also ignores the out return values as they're never used.
2021-01-23 12:15:56 +01:00
Markus Kowalewski
68fa960f6a
nixos/release-notes: add comment about generic mpi attribute
2021-01-23 12:15:18 +01:00
Stig
c52a11e741
Merge pull request #110389 from tnias/usbguard_test_pr
...
nixos/tests/usbguard: init
2021-01-23 02:50:50 +01:00
Philipp Bartsch
b912846267
nixos/tests/usbguard: init
2021-01-23 01:19:11 +01:00
Jonathan Ringer
0bc275e634
Revert "lib: Clean up how linux and gcc config is specified"
...
This is a stdenv-rebuild, and should not be merged
into master
This reverts commit 8929989614
.
2021-01-22 14:07:06 -08:00
John Ericson
d95aebbe0e
Merge pull request #107214 from Ericson2314/linux-config-cleanup
...
lib: Clean up how linux and gcc config is specified
2021-01-22 15:15:58 -05:00
clefru
60c8cf4e02
Update nixos/lib/make-disk-image.nix
...
Co-authored-by: Alyssa Ross <hi@alyssa.is>
2021-01-22 19:58:23 +01:00
Kevin Griffin
515d801aee
fish: add babelfish translation option
...
Configuration may be ran through fenv at shell start time
(as previously) or translated to fish at build time with
the babelfish package.
2021-01-22 09:24:40 -08:00
Fritz Otlinghaus
0a38f6da4f
nixos/tomcat: add extraGroups type ( #110486 )
2021-01-22 16:22:06 +01:00
Rémy Grünblatt
cea5fca275
galene: init at 0.2
2021-01-22 15:56:05 +01:00
Anderson Torres
0f31f03f22
Merge pull request #108578 from ctem/feature/chrony
...
nixos/chrony: add support for Network Time Security (NTS) authentication
2021-01-22 09:36:08 -03:00
Florian Klink
ad87ca737d
Merge pull request #110403 from thiagokokada/fix-renamed-option
...
nixos/libinput: add missing renamed module
2021-01-22 12:25:44 +01:00
Fritz Otlinghaus
c1efc32740
nixos/module/jboss: Add types to options ( #110451 )
2021-01-22 11:11:40 +01:00
Fritz Otlinghaus
332a53728c
activemq: add type to configurationDir ( #110450 )
2021-01-22 11:11:05 +01:00
Fritz Otlinghaus
fc0d3f8da8
nixos/crashdump: Add type to option ( #110448 )
2021-01-22 11:10:26 +01:00
Fritz Otlinghaus
800b90ea3f
nixos/bitlbee: Add types to options ( #110446 )
2021-01-22 11:07:29 +01:00
Robert Hensing
bbaff89ceb
Merge pull request #109976 from hercules-ci/systemd-allow-preStart-with-ExecStartPre
...
nixos/systemd: allow preStart with other ExecStartPre cmdlines
2021-01-22 10:18:11 +01:00
John Ericson
8929989614
lib: Clean up how linux and gcc config is specified
...
The `platform` field is pointless nesting: it's just stuff that happens
to be defined together, and that should be an implementation detail.
This instead makes `linux-kernel` and `gcc` top level fields in platform
configs. They join `rustc` there [all are optional], which was put there
and not in `platform` in anticipation of a change like this.
`linux-kernel.arch` in particular also becomes `linuxArch`, to match the
other `*Arch`es.
The next step after is this to combine the *specific* machines from
`lib.systems.platforms` with `lib.systems.examples`, keeping just the
"multiplatform" ones for defaulting.
2021-01-21 22:44:09 -05:00
Thiago Kenji Okada
c6cf9bcf0b
nixos/libinput: add missing renamed module
...
Related PR #108909 .
2021-01-21 19:52:57 -03:00
Guillaume Girol
7ed3d2df76
Merge pull request #103135 from symphorien/pr/92775
...
Evolution ews: wrap evolution and evolution data server, fix nixos module.
2021-01-21 19:42:45 +00:00
Markus Kowalewski
dcae37989f
tests/slurm: update mysql config to use settings
2021-01-21 17:51:28 +01:00
Linus Heckemann
5153deedd8
Merge pull request #108909 from thiagokokada/libinput-by-device-type
...
nixos/libinput: separate settings by mouse/touchpad
2021-01-21 10:43:44 +01:00
Matthew Bauer
da9fc7b068
Merge pull request #108072 from matthewbauer/fix-binfmt-activation
...
nixos/binfmt.nix: fix running commands in binfmt
2021-01-20 16:31:53 -06:00
Kevin Cox
f1d3b04c04
Merge pull request #109966 from thiagokokada/bump-opentabletdriver
...
opentabletdriver: 0.4.2 -> 0.5.0
2021-01-20 16:37:16 -05:00
zowoq
b46b3d928d
nixos/podman: readd rootless runc test
...
use `loginctl enable-linger` to create systemd session
2021-01-21 06:57:51 +10:00
Sandro
ec84cbf95f
Merge pull request #110107 from LeSuisse/cifs-utils-missing-python3-smbinfo
...
cifs-utils: missing python3 dependency for smbinfo
2021-01-20 20:12:37 +01:00
Michael Weiss
88637a1c33
Merge pull request #110198 from primeos/chromium-vm-test
...
nixos/tests/chromium: Add ungoogled-chromium and Google Chrome
2021-01-20 20:00:58 +01:00
Symphorien Gibol
f45f22d519
nixos/evolution: enable gnome-keyring
2021-01-20 19:51:32 +01:00
Lassulus
c3116cdce2
Merge pull request #110122 from helsinki-systems/timeservers-option-type
...
networking, chrony, ntpd, timesyncd: add timeServers option type
2021-01-20 19:36:06 +01:00
Michael Weiss
ff8866e243
nixos/tests/chromium: Add ungoogled-chromium and Google Chrome
...
By default only `chromium` will be tested but other "channels" can be
selected using e.g.:
nix-build nixos/tests/chromium.nix -A ungoogled
This also adds me as secondary maintainer (I'd like to get notified on
PRs/issues and can review them).
2021-01-20 19:20:53 +01:00
Thomas Gerbet
5858d84658
cifs-utils: missing python3 dependency for smbinfo
...
Since cifs-utils 6.12, smbinfo needs Python to be usable.
Issue introduced in 033208fd46
.
2021-01-20 18:39:42 +01:00
Michael Weiss
8a7a8442c1
nixos/tests/chromium: Fix a race condition
...
Only execute Ctrl+w to close the currently active window if the
new/secondary window (title: "New Tab") could be selected. This fixes a
test failure since the update to Chromium M88 (cc PR #110010 ).
Without this additional check the main window (title: "startup done")
could still be selected (and thus will be closed) and the script would
close both windows (i.e. terminate Chromium completely).
2021-01-20 16:57:46 +01:00
Michael Weiss
2053744515
Merge pull request #110010 from primeos/chromium
...
chromium: 87.0.4280.141 -> 88.0.4324.96
2021-01-20 15:41:15 +01:00
Michael Weiss
2dbd08dcbd
release-combined.tested: Temporarily remove the Chromium test
...
Chromium seems to run fine but the VM test fails and prints errors like:
machine # There are no windows in the stack
machine # Invalid window '%1'
machine # Usage: windowfocus [window=%1]
machine # --sync - only exit once the window has focus
This could be due to changes in Chromium's X11 code (or maybe some
changes for Ozone/X11). I'll investigate this but let's temporarily
remove the Chromium test from the tested jobset until I find a proper
solution/fix.
2021-01-20 15:23:55 +01:00
Scriptkiddi
2800882b4b
bind: Add types for options
2021-01-20 14:34:34 +01:00
Scriptkiddi
1572940688
networking, chrony, ntpd, timesyncd: add timeServers option type
2021-01-20 10:54:24 +01:00
WORLDofPEACE
35ad1687a7
Merge pull request #109060 from MetaDark/nixos/xdg/portal
...
nixos/xdg/portal: fix loading portals from systemd service
2021-01-20 03:29:16 -05:00
Robert Hensing
d51d15e1cf
Merge pull request #109665 from prusnak/stdenv-lib-nixos
...
nixos/modules: stdenv.lib -> lib
2021-01-19 23:50:30 +01:00
Sandro
f591395492
Merge pull request #108319 from KaiHa/pr/nitrokey-app-1.4.2
2021-01-19 19:20:35 +01:00
Robert Hensing
04946f4246
nixos/vault: extraConfigPaths -> extraSettingsPaths
...
Align with RFC42 language, even if in advance of the actual settings
attribute.
2021-01-19 18:14:29 +01:00
Thiago Kenji Okada
313ee6bd96
opentabletdriver: 0.4.2 -> 0.5.0
2021-01-19 14:05:48 -03:00
Robert Hensing
3936d85ec3
nixos/systemd: allow preStart with other ExecStartPre cmdlines
...
Declaring them as lists enables the concatenation, supporting
lib.mkBefore, lib.mkOrder, etc.
This is useful when you need to extend a service with a pre-start
script that needs to run as root.
2021-01-19 16:29:29 +01:00
Jonathan Ringer
e2fcf81d2a
nixos/modules: pkgconfig -> pkg-config
2021-01-19 01:16:25 -08:00
Jonathan Ringer
4edbbe523c
nixos/manual: pkgconfig -> pkg-config
2021-01-19 01:16:25 -08:00
Sandro
710a84461b
Merge pull request #104920 from ThibautMarty/herbstluftwm-0.9.0
2021-01-18 23:09:46 +01:00
Christian Kampka
f0ec10a829
treewide: remove kampka as maintainer ( #109813 )
2021-01-18 21:23:49 +01:00
Ryan Mulligan
2b8cdd5f3b
Merge pull request #89472 from asymmetric/relnotes-grub
...
rl-2003: mention grub 2.04 update
2021-01-18 11:50:52 -08:00
Maximilian Bosch
2abfc93a68
nixos/grafana-image-renderer: typo fix
...
Since the service doesn't do a strict config check, this worked fine
before, however the settings in the block never applied properly.
2021-01-18 18:44:58 +01:00
Thibaut Marty
a6cdb113bd
herbstluftwm: add NixOS test
2021-01-18 16:12:52 +00:00
Maximilian Bosch
fbdd82bf9b
Merge pull request #109691 from nh2/manual-element-base_url
...
manual: Element: Fix misleading `base_url`.
2021-01-18 14:32:54 +01:00
Sandro
4eccd6f731
Merge pull request #97449 from AberDerBart/mpd
...
nixos/mpd: fix not properly testing for songs to be in the playlist
2021-01-18 13:47:57 +01:00
Kevin Cox
4ee9a86405
Merge pull request #109042 from Atemu/installer-tests-more-cores
...
tests/installer: give installer VM more cores
2021-01-18 06:14:50 -05:00
github-actions[bot]
ef2abc20bc
Merge master into staging-next
2021-01-18 06:42:35 +00:00
Kai Harries
991aba30f8
module nitrokey: drop option group
...
Since the update of the nitrokey-app to 1.4.2 the group option is no
longer supported.
2021-01-18 07:36:51 +01:00
Niklas Hambüchen
b954e0a12f
manual: Element: Fix misleading base_url
.
...
Judging from `"${pkgs.element-web}/config.sample.json"`,
this needs be a URL starting with `https://`; without it one gets:
Your Element is misconfigured
Invalid base_url for m.homeserver
2021-01-18 04:43:32 +01:00
Bernardo Meurer
e1340190a9
nixos/nomad: default enableDocker to true
2021-01-17 18:54:06 -08:00
Bernardo Meurer
1f8d0d771c
nixos/nomad: init
...
Co-authored-by: Niklas Hambüchen <mail@nh2.me>
2021-01-17 15:11:16 -08:00
Pavol Rusnak
66dc9dbb59
nixos/modules: stdenv.lib -> lib
2021-01-17 21:40:51 +01:00
Jörg Thalheim
1279bf812c
Merge remote-tracking branch 'upstream/master' into HEAD
2021-01-17 18:08:59 +01:00
WilliButz
254b510ce7
nixos/promtheus-nextcloud-exporter: update module and test
...
Use new command-line flags of release 0.3.0 and always answer with the
expected XML in the VM test instead of using a test-specific fixed path.
Co-authored-by: ajs124 <git@ajs124.de>
2021-01-17 15:25:18 +01:00
github-actions[bot]
9541eb734d
Merge master into staging-next
2021-01-17 12:38:49 +00:00
markuskowa
2756a5b4df
Merge pull request #109607 from alesguzik/improve_snapper_example
...
nixos/snapper: improve config example
2021-01-17 11:39:00 +01:00
Symphorien Gibol
d671677eab
nixos: rework evolution-data-server module
2021-01-17 11:13:54 +01:00
Daniel Șerbănescu
e44b3c5187
evolution-with-plugins: added support for evolution-ews.
2021-01-17 11:13:54 +01:00
Ales Huzik
6e65b724be
nixos/snapper: improve config example
...
In the default configuration we have timers for creating and deleting
snapper snapshots, and it looks like if we just create configs with
correct mountpoints we will get automatic snapshots (which either
used to be true, or seems to be only true on Archlinux according to
their wiki). In default snapper configuration TIMELINE_CREATE and
TIMELINE_CLEANUP are set to "no", so just providing configs won't
be enough for having automatic backups, which are the main usecase
for snapper. In other linux distributions you would use `snapper
create-config` to generate configs for partitions and you'd have a
chance to notice that TIMELINE_CREATE is set to no. Also, my guess is
that it might be set to no by default for safety reasons in regular distros,
so that the config won't be actioned upon until the user finishes
customizing it.
2021-01-17 19:13:35 +11:00
github-actions[bot]
f46cb85082
Merge master into staging-next
2021-01-16 18:51:05 +00:00
Jörg Thalheim
21d78fa465
Merge pull request #109494 from ipetkov/nixos-zpool-trim-persistent-timer
...
nixos/zfs: make zpool-trim timer persistent
2021-01-16 13:20:18 +00:00
Aaron Andersen
6b0ba74baa
Merge pull request #109099 from jpotier/fix-deprecation-warning-azure-agent
...
nixos/azure-agent: fix deprecation warning
2021-01-16 07:52:05 -05:00
github-actions[bot]
2445824f40
Merge master into staging-next
2021-01-16 12:40:04 +00:00
Ivan Petkov
e2fa74dc68
nixos/zfs: make zpool-trim timer persistent
...
If the machine is powered off when the zpool-trim timer is supposed to
trigger (usually around midnight) then the timer will be skipped
outright in favor of the next instance.
For desktop systems which are usually powered off at this time, zpool
trimming will never be run which can degrade SSD performance.
By marking the timer as `Persistent = yes` we ensure that it will run at
the first possible opportunity after the trigger date is reached.
2021-01-15 20:23:16 -08:00
Domen Kožar
c32f5b22f1
move nixos-rebuild into pkgs
2021-01-15 20:07:38 +01:00
Jan Tojnar
c0d2951fa6
Merge branch 'master' into staging-next
2021-01-15 17:46:46 +01:00
Kevin Cox
bb96017198
Merge pull request #108932 from Atemu/iso-image-compress-filter
...
iso-image: enable XZ compress filter
2021-01-15 11:32:21 -05:00
Atemu
2fcab516c4
iso-image: enable XZ compress filter
...
Minimal ISO:
1m21 -> 2m25
625M -> 617M
Plasma5 ISO:
2m45 -> 5m18
1.4G -> 1.3G
Decompression speed stays about the same. It's just a few seconds for the whole
image anyways and, with that kind of speed, you're going to be bottlenecked by
IO long before the CPU.
2021-01-15 17:17:52 +01:00
Milan Pässler
4000091123
nixos/docker: change misleading error message
...
The socketActivation option was removed, but later on socket activation
was added back without the option to disable it. The description now reflects
that socket activation is used unconditionally in the current setup.
2021-01-15 15:00:11 +01:00
Mark Vainomaa
f53cf9a65c
Revert "nixos/tests/docker: wait for docker service"
...
This reverts commit c14bafd6c7
.
2021-01-15 15:53:43 +02:00
Mark Vainomaa
a81c27cd54
docker: fix systemd socket activation
2021-01-15 15:53:31 +02:00
clerie
10eed48d10
nixos/gitea: make more secrets persistent ( #108676 )
...
Added JWT_SECRET and INTERNAL_TOKEN to be persistent, like SECRET_KEY and LFS_JWT_SECRET do. Also renamed some vars belonging to SECRET_KEY and LFS_JWT_SECRET to get a consistent naming scheme over all secrets.
2021-01-15 12:54:14 +01:00
Erik Arvstedt
9a283a038d
nixos-container: fix nixpkgs
container options being ignored
...
Since the introduction of option `containers.<name>.pkgs`, the
`nixpkgs.*` options (including `nixpkgs.pkgs`, `nixpkgs.config`, ...) were always
ignored in container configs, which broke existing containers.
This was due to `containers.<name>.pkgs` having two separate effects:
(1) It sets the source for the modules that are used to evaluate the container.
(2) It sets the `pkgs` arg (`_module.args.pkgs`) that is used inside the container
modules.
This happens even when the default value of `containers.<name>.pkgs` is unchanged, in which
case the container `pkgs` arg is set to the pkgs of the host system.
Previously, the `pkgs` arg was determined by the `containers.<name>.config.nixpkgs.*` options.
This commit reverts the breaking change (2) while adding a backwards-compatible way to achieve (1).
It removes option `pkgs` and adds option `nixpkgs` which implements (1).
Existing users of `pkgs` are informed by an error message to use option
`nixpkgs` or to achieve only (2) by setting option `containers.<name>.config.nixpkgs.pkgs`.
2021-01-15 12:49:42 +01:00
Jörg Thalheim
f3042e3078
Merge pull request #108862 from cpcloud/refactor-nvidia-containers
2021-01-15 11:10:09 +00:00
Jörg Thalheim
9c4a18591f
Merge pull request #109096 from ju1m/tor
...
nixos/tor: fix openFirewall when ORPort isInt
2021-01-15 08:37:22 +00:00
github-actions[bot]
83c50873f5
Merge master into staging-next
2021-01-15 06:40:38 +00:00
Milan
f634c149e4
nixos/tests/docker: wait for docker service ( #109418 )
...
Previously the Docker daemon was started by systemd socket activation.
Thus, the Docker test waited for the sockets.target unit.
But when the docker module was changed to start the Docker daemon at
boot instead of by socket activation, the test was left untouched.
With the Docker 20.10 update this lead to a timing issue, where the
docker command is run before the Docker daemon has started and hangs.
Fixes #109416
2021-01-15 03:38:15 +01:00
Milan
4171cd53d6
redis: make masterAuth option optional ( #109417 )
2021-01-15 03:21:27 +01:00
github-actions[bot]
9f69dadafd
Merge master into staging-next
2021-01-15 01:16:33 +00:00
Andreas Rammhold
3be09b94fb
Merge pull request #108860 from endocrimes/dani/fix-tmp
...
modules/boot: Specify the type for tmpfs mounts
2021-01-15 00:31:14 +01:00
Kevin Cox
ddad87f26a
Merge pull request #108940 from Atemu/zfs-test-with-stable-linuxPackages
...
tests/zfs: test stable with stable linuxPackages
2021-01-14 17:09:02 -05:00
Kevin Cox
5666f34b28
Merge pull request #91813 from Mic92/types1
...
nixos/*: Add types to the database module options
2021-01-14 17:04:54 -05:00
Alyssa Ross
3893d6c6d7
gitAndTools: move everything to the top level
...
The comment at the top of git-and-tools/default.nix said:
/* All git-relates tools live here, in a separate attribute set so that users
* can get a fast overview over what's available.
but unfortunately that hasn't actually held up in practice.
Git-related packages have continued to be added to the top level, or
into gitAndTools, or sometimes both, basically at random, so having
gitAndTools is just confusing. In fact, until I looked as part of
working on getting rid of gitAndTools, one program (ydiff) was
packaged twice independently, once in gitAndTools and once at the top
level (I fixed this in 98c3490196
).
So I think it's for the best if we move away from gitAndTools, and
just put all the packages it previously contained at the top level.
I've implemented this here by just making gitAndTools an alias for the
top level -- this saves having loads of lines in aliases.nix. This
means that people can keep referring to gitAndTools in their
configuration, but it won't be allowed to be used within Nixpkgs, and
it won't be presented to new users by e.g. nix search.
The only other change here that I'm aware of is that
appendToName "minimal" is not longer called on the default git
package, because doing that would have necessitated having a private
gitBase variable like before. I think it makes more sense not to do
that anyway, and reserve the "minimal" suffix only for gitMinimal.
2021-01-14 21:27:48 +00:00
github-actions[bot]
183b673b64
Merge master into staging-next
2021-01-14 18:54:05 +00:00
Michael Raskin
01372e6624
Merge pull request #109066 from michael-p-m-white/reenable-working-clfswm
...
Reenable working clfswm
2021-01-14 14:14:56 +00:00
github-actions[bot]
730ff71234
Merge master into staging-next
2021-01-14 12:42:20 +00:00
Alyssa Ross
011d073393
nixos/postfix: deprecate services.postfix.useDane
...
Now that smtp_tls_security_level is using mkDefault, and therefore can
be overridden, there's no need for an option for overriding it to a
specific value.
2021-01-14 10:24:31 +00:00
Alyssa Ross
9ed5ee909b
nixos/postfix: allow custom smtp_tls_security_level
...
I run Postfix on my workstation as a smarthost, where it only ever
talks to my SMTP server. Because I know it'll only ever connect to
this server, and because I know this server supports TLS, I'd like to
set smtp_tls_security_level to "encrypt" so Postfix won't fall back to
an unencrypted connection.
2021-01-14 10:24:31 +00:00
Michele Guerini Rocco
721a4ecfa6
Merge pull request #109114 from illustris/searx
...
searx: 0.17.0 -> 0.18.0
2021-01-14 10:15:37 +01:00
Jörg Thalheim
dbd05a5289
Update nixos/modules/security/wrappers/wrapper.nix
...
Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
2021-01-14 09:00:34 +00:00
rnhmjoj
f741cccd45
nixos/searx: remove settings.yml merging script
...
Starting with 0.18.0, searx can merge the settings.yml automatically
with the default values, so the script is obsolete.
2021-01-14 09:48:02 +01:00
rnhmjoj
1013de19f1
nixos/searx: fix for 0.18.0 update
2021-01-14 09:48:01 +01:00
Jörg Thalheim
eadffd9154
nixos/wrappers: fix applying capabilities
...
With libcap 2.41 the output of cap_to_text changed, also the original
author of code hoped that this would never happen.
To counter this now the security-wrapper only relies on the syscall
ABI, which is more stable and robust than string parsing. If new
breakages occur this will be more obvious because version numbers will
be incremented.
Furthermore all errors no make execution explicitly fail instead of
hiding errors behind debug environment variables and the code style was
more consistent with no goto fail; goto fail; vulnerabilities (https://gotofail.com/ )
2021-01-14 08:46:57 +01:00
github-actions[bot]
d247d74ff9
Merge master into staging-next
2021-01-14 06:44:24 +00:00
Sandro
7ab8f240ba
Merge pull request #109303 from ilian/fix/openldap-maintainers-typo
...
openldap: fix typo when specifying maintainers list
2021-01-14 07:43:50 +01:00
Jan Tojnar
b813710c04
Merge branch 'master' into staging-next
2021-01-14 02:24:17 +01:00
Silvan Mosberger
ffdefb66c0
Merge pull request #108966 from pstn/murmurPswitch
...
nixos/murmur: Add overrideable package switch
2021-01-14 01:07:56 +01:00
sephalon
76fad08473
nixos/matrix-synapse: enable HTTPS in example ( #109230 )
...
The /.well-known endpoint must use HTTPS, see specification:
https://matrix.org/docs/spec/server_server/latest#resolving-server-names .
2021-01-13 22:20:17 +01:00
ilian
52a6cc02c5
openldap: fix typo in maintainers
2021-01-13 19:15:18 +01:00
adisbladis
4003f8cbc7
treewide: emacsPackages -> emacs.pkgs & emacsWithPackages -> emacs.pkgs.withPackages
...
The previous names are now aliases and shouldn't be used anywhere inside nixpkgs.
2021-01-13 17:13:10 +01:00
Vladimír Čunát
9e2880e5fa
nixos ISO image: revert another part of 8ca33835ba
2021-01-13 15:25:19 +01:00
Vladimír Čunát
1a16428c17
nixos ISO image: revert a part of 8ca33835ba
...
Thanks @ primeos. This wasn't really needed; my mistake.
2021-01-13 14:50:40 +01:00
Thiago Kenji Okada
0f762e5582
nixos/doc: document services.xserver.libinput changes
2021-01-13 10:20:38 -03:00
Thiago Kenji Okada
887386fbbe
nixos/doc: fix manual reference to libinput
2021-01-13 10:20:34 -03:00
Vladimír Čunát
8ca33835ba
nixos: fixup build of aarch64 minimal ISO ( fixes #109252 )
...
Perhaps it's not pretty nor precise; feel free to improve.
2021-01-13 14:05:45 +01:00
Thiago Kenji Okada
cd15b3a30a
nixos/libinput: separate settings by mouse/touchpad
...
This commits deprecates `services.xserver.libinput` for multiple
settings, one for each kind of device:
- `services.xserver.libinput.mouse`
- `services.xserver.libinput.touchpad`
Looking at `man 4 libinput`, they basically have the same options so I
simply replicated them, even if some options doesn't make sense for
mouse (`tapping` for example).
With this commit this is now possible:
```nix
{
services.xserver.libinput = {
enable = true;
mouse = {
accelProfile = "flat";
};
touchpad = {
naturalScrolling = true;
};
};
}
```
And you will have a mouse with no natural scrolling but with accel
profile flat, while touchpad will have natural scrolling but accel
profile adaptative (default).
It is possible to support more device types
(tablets/keyboards/touchscreens), but at least looking at the
libinput manual for those devices it doesn't seem that it has any
configuration options for them. They can still be configured using
`services.xserver.inputClassSections` though, and this will work now
since there is no rule by default that matches them.
Closes issue #75007 , while also making configuration of mouses and
touchpads using Nix attrs possible like said in PR #73785 .
2021-01-13 09:54:28 -03:00
Mark Vainomaa
b451286b1f
docker: 19.03.4 -> 20.10.2 ( #108960 )
...
This commit refactors the build process to handle Docker engine and
CLI split.
2021-01-13 11:33:14 +01:00
github-actions[bot]
318e673af0
Merge master into staging-next
2021-01-13 06:40:30 +00:00
Silvan Mosberger
0cd5058afd
Merge pull request #85842 from iblech/patch-whitebophir
...
whitebophir: init at 1.7.0 (package and service)
2021-01-13 03:06:34 +01:00
Ingo Blechschmidt
46292d7f86
nixos/whitebophir: init
2021-01-13 01:25:43 +01:00
Lucas Savva
514a0b6d8a
nixos/acme: Fix bash issue, enable debug
...
I found a logical error in the bash script, but during
debugging I enabled command echoing and realised it
would be a good idea to have it enabled all the time for
ease of bug reporting.
2021-01-12 19:11:52 +00:00
github-actions[bot]
f47a1ddfe4
Merge master into staging-next
2021-01-12 18:47:24 +00:00
Stefan Wiehler
b6f8ee9f83
nixos/nextcloud: document adminpassFile permissions
2021-01-12 19:31:14 +01:00
Izorkin
91e580397e
mariadb: 10.4.15 -> 10.5.8
2021-01-12 17:22:54 +03:00
Izorkin
d688f790dd
mariadb: drop build server with tokudb storage
2021-01-12 17:22:47 +03:00
Martin Potier
de02ae9350
nixos/azure-agent: fix deprecation warning
2021-01-12 13:00:38 +02:00
Julien Moutinho
7a62c0bc95
nixos/tor: fix openFirewall when ORPort isInt
2021-01-12 10:14:14 +01:00
github-actions[bot]
32a46d68f3
Merge master into staging-next
2021-01-12 01:04:47 +00:00
Kira Bruneau
a13064ae27
nixos/xdg/portal: fix loading portals from systemd service
2021-01-11 19:22:22 -05:00
Michael White
952f2c76e0
nixos/clfswm: Restore working quicklisp package
2021-01-11 17:19:50 -07:00
Graham Christensen
7092dd52f8
amazonImage: Upload disks as GP3 for cheaper & faster IO ( #109027 )
...
GP3 is always faster and cheaper than GP2, so sticking to GP2 is
leaving money on the table.
https://cloudwiry.com/ebs-gp3-vs-gp2-pricing-comparison/
2021-01-11 13:54:40 -05:00
github-actions[bot]
757ad34b82
Merge master into staging-next
2021-01-11 18:42:29 +00:00
Frederik Rietdijk
450cb04f16
nixos: hardware.nvidia.package option for selecting nvidia package
...
Make it possible to select a derivation to use. This also moves some
logic that belongs to the derivation back into it.
2021-01-11 13:01:48 -05:00