3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

20588 commits

Author SHA1 Message Date
Thomas Bereknyei a9d88757eb bind: add required config to test 2021-02-22 02:17:24 -05:00
github-actions[bot] d8f2a7bf5c
Merge master into staging-next 2021-02-22 00:37:52 +00:00
Robert Hensing 2c0bb4d969
Merge pull request #113944 from xoe-labs/da/fixup-sd-card-move
installer: fixup sd-card folder move from #110827
2021-02-21 23:27:02 +01:00
adisbladis 21ca496b1d
Merge pull request #113886 from davidak/traefik-oci-containers
traefik: update test to use virtualisation.oci-containers
2021-02-21 22:45:25 +01:00
David Arnold 6a3855af2b
Merge branch 'master' into da/fixup-sd-card-move 2021-02-21 16:39:38 -05:00
Jörg Thalheim a9bf245393
Merge pull request #113772 from Mic92/pipewire
nixos/pipewire: only enable media-session if pipewire is enabled
2021-02-21 21:21:51 +00:00
David Arnold 6bfaed9b2c
installer: fixup sd-card folder move from #110827 2021-02-21 16:12:54 -05:00
WORLDofPEACE 0c3514f782
Merge pull request #99011 from andersk/plymouth-label
nixos/plymouth: Add label plugin and a font to the initrd
2021-02-21 15:44:54 -05:00
Anders Kaseorg 9d21f1dfab nixos/plymouth: Add label plugin and a font to the initrd
This allows Plymouth to show the “NixOS 21.03” label under the logo at
startup like it already does at shutdown.

Fixes #59992.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2021-02-21 10:27:15 -08:00
github-actions[bot] 93b17c1b4d
Merge master into staging-next 2021-02-21 18:17:22 +00:00
Robert Hensing 92b1ef601c
Merge pull request #110827 from xoe-labs/da/sd-are-no-installation-devices
installer: split sd cards -> base for bespoke sd images
2021-02-21 18:34:47 +01:00
WORLDofPEACE 4287f5adfa
Merge pull request #100569 from andersk/gdm-plymouth
nixos/gdm: Conflict plymouth-quit, but more carefully
2021-02-21 11:03:18 -05:00
Guillaume Girol aed173ff97
Merge pull request #113904 from ju1m/dnscrypt-proxy2
nixos/dnscrypt-proxy2: reallow @sync syscalls
2021-02-21 14:17:24 +00:00
Julien Moutinho 862481560c nixos/dnscrypt-proxy2: reallow @sync syscalls 2021-02-21 14:53:54 +01:00
Guillaume Girol 1d55adbce8
Merge pull request #113237 from jflanglois/fix-kmscon
nixos/services/kmscon: fix systemd configuration
2021-02-21 13:43:31 +00:00
Dominik Xaver Hörl f7fce2c52f nixos/rl-2105: document removal of the hidepid module 2021-02-21 13:51:37 +01:00
Dominik Xaver Hörl 893d911b55 nixos/hidepid: drop the module as the hidepid mount option is broken
This has been in an unusable state since the switch to cgroups-v2.
See https://github.com/NixOS/nixpkgs/issues/73800 for details.
2021-02-21 13:51:37 +01:00
github-actions[bot] cf22d5fee7
Merge master into staging-next 2021-02-21 12:19:43 +00:00
Florian Klink e3d3643f1b nixos/release-notes/rl-2105.xml: fix typo 2021-02-21 13:14:55 +01:00
WORLDofPEACE 4efb432e72
Merge pull request #113850 from nbraud/rngd
nixos/rngd: Remove module entirely, leave an explanation
2021-02-21 07:11:04 -05:00
WORLDofPEACE 3c88820235 rl-2105: rngd 2021-02-21 07:09:13 -05:00
rnhmjoj 9be0529210
nixos/console: fix console setting reloading
It's a dull and boring day, it's cold outside and I'm stuck at home: let
me tell you the story of systemd-vconsole-setup.

In the beginnings of NixOS[1], systemd-vconsole-setup was a powerful
sysinit.target unit, installed and running at boot to set up fonts
keyboard layouts and even colors of the virtual consoles. If needed, the
service would also be restarted after a configuration change, consoles
were happy and everything was good, well, almost.

Since the service had no way to specify the dependency "ttys are ready",
modesetting could sometimes happen *after* systemd-vconsole-setup had
started, leaving the console in a broken state. So abbradar worked
around that by putting a systemd-udev-settle `After=`.

In the meanwhile, probably realizing their mistake, systemd added a
shiny udev rule to start the systemd-udev-settle at the right time[2].
However, the rule bypassed systemd by directly running the binary
`systemd-udev-settle`, and the service - though still installed - fell
into disuse.

Two years would pass before a good samaritan, seeing the poor jobless
systemd-udev-settle service, decided to give it the coup de grâs[3] by
unlisting it from the installed units.
This, combined with another bug, caused quite a commotion[4] in NixOS;
to see why remember the fact that `WantedBy=` in upstream units doesn't
work[5], so it had to be added manually in cc542110, but while systemd
removed it, the NixOS unit continued to install and restart the service,
making a lot of fuss when switching configuration.

After at least thee different tentative fixes, deedrah realised[6] what
the root cause was and fpletz put the final nail[7] in the coffin of
systemd-udev-settle. The service would never see the light of a boot
again, NixOS would not restart it all the time but thanks to udev
consoles would still get their pretty fonts and playful colors.

The En..

..no, wait! You should ask what came of systemd-udev-settle, first.
And why is the service even around if udev is doing all the work?

Udev-settle, like the deceitful snake that he is, laid hidden for years.
He looks innocuous doesn't it? A little hack. Only until it leaves his
den and a poor user[8] drops dead. Obviously, it serves no purpose, as
the service is not part of the boot process anymore, so let's remove it
for good!

About the service, it may not be useful at boot, but it can be started
to pick up changes in vconsole.conf and set the consoles accordingly.
But wait, this doesn't work anymore: the service is never started at
boot (remember f76d2aa6), so switch-to-configuration.pl will not restart
it. Fortunately it can be repaired: here I install a new unit which
does *nothing* on start, but restarts the real service when reloaded.
This perfectly reproduces the original behavior, hopefully without the
original bugs too.

The End?

[1]: cc54211069
[2]: f6ba8671d8 (diff-84849fddcef81458f69725dc18c6614aade5c4f41a032b6908ebcf1ee6740636)
[3]: 8125e8d38e
[4]: https://web.archive.org/web/20180603130107/https://github.com/NixOS/nixpkgs/issues/22470
[5]: https://github.com/NixOS/nixpkgs/issues/81138
[6]: https://web.archive.org/web/20180603130107/https://github.com/NixOS/nixpkgs/issues/22470#issuecomment-330930456
[7]: f76d2aa6e3
[8]: https://github.com/NixOS/nixpkgs/issues/107341
2021-02-21 10:27:34 +01:00
davidak 193bf09ef7 traefik: update test to use virtualisation.oci-containers 2021-02-21 09:16:04 +01:00
github-actions[bot] 2c8fa86436
Merge master into staging-next 2021-02-21 06:16:32 +00:00
davidak 01148a5ba7
Merge pull request #111642 from turion/dev_test_keepassxc
nixos/tests: add keepassxc
2021-02-21 03:12:07 +01:00
github-actions[bot] dc31fd042c
Merge master into staging-next 2021-02-21 00:38:49 +00:00
nicoo 16b6c4b2d7 nixos/manual/virtualbox-guest: Remove mentions of rngd 2021-02-21 01:37:18 +01:00
nicoo d7c15d0eec nixos/hyperv-guest: rngd was removed, no need to disable it 2021-02-21 01:34:56 +01:00
nicoo c8dcbfc047 nixos/swap: Remove dependency on rngd (module removed) 2021-02-21 01:33:50 +01:00
nicoo 39383a8494 nixos/rngd: Remove module entirely, leave an explaination
Per @shlevy's request on #96092.
2021-02-21 01:32:50 +01:00
Florian Klink d0be6dcd70
Merge pull request #110784 from talyz/gce-fetch-ssh-keys
google-compute-config: Reintroduce fetch-ssh-keys
2021-02-20 22:19:53 +01:00
Michele Guerini Rocco 19d715c573
Merge pull request #107382 from rnhmjoj/no-udev-settle
nixos/{networkd,dhcpcd}: remove udev-settle hack
2021-02-20 20:49:19 +01:00
Vladimír Čunát 008a2b2949
Merge #112674: nixos/tests/networking: fix DHCP race 2021-02-20 20:23:38 +01:00
Jörg Thalheim f3918b4bc3
nixos/pipewire: only enable media-session if pipewire is enabled 2021-02-20 13:42:18 +01:00
github-actions[bot] 4c0670dace
Merge staging-next into staging 2021-02-20 06:17:59 +00:00
Sandro 38769f8a26
Merge pull request #113715 from vojta001/miniflux-docs
miniflux: fix link to docs
2021-02-20 06:09:00 +01:00
github-actions[bot] abe7db36a4
Merge staging-next into staging 2021-02-20 00:36:40 +00:00
Aaron Andersen cb2bce709f
Merge pull request #83479 from matt-snider/nixos/etesync-dav
nixos/etesync-dav: init module
2021-02-19 19:02:37 -05:00
David Arnold 68afbf9d63 installer: add deprecation warning about sd-card file move 2021-02-19 19:00:19 -05:00
David Arnold 1009c09b4f installer: amend release with sd-card file move 2021-02-19 19:00:19 -05:00
David Arnold 481f68f1a5 installer: add back-compat files for sd-card image folder move 2021-02-19 19:00:19 -05:00
David Arnold 3c744bf68d installer: split sd-card into installer & base for bespoke image 2021-02-19 19:00:19 -05:00
David Arnold 3323b0ff0d
installer: move ./cd-dvd/sd-card* -> ./sd-card/ 2021-02-19 18:56:23 -05:00
Florian Klink 68496cb927
Merge pull request #113570 from xaverdh/remove-systemConfig
Remove system config kernel parameter
2021-02-19 20:43:07 +01:00
Vojtěch Káně d51ec7e83d miniflux: fix link to docs 2021-02-19 20:14:14 +01:00
Jan Tojnar 8f50f1ce10
Merge branch 'staging-next' into staging
Resolved the following conflicts:

- kernel flags between 09176d28a0 and 2b28822d8d
- clojure-lsp between 3fa00685ce and e03c068af5
2021-02-19 17:15:31 +01:00
Guillaume Girol 56923181e9
Merge pull request #107402 from ctem/fix/luksroot-master
boot.initrd.luks: add reusePassphrases support for YubiKey 2FA
2021-02-19 15:42:45 +00:00
talyz 95f96de78e
gce/fetch-ssh-keys: Put script in separate file, use PrivateTmp...
...check the script with shfmt and shellcheck + some other minor
refactoring.
2021-02-19 15:17:12 +01:00
Sandro 4b694d5e3d
Merge pull request #113674 from SuperSandro2000/fix-collection16 2021-02-19 13:27:03 +01:00
rnhmjoj d683d26d89
nixos/release-notes: warn on interface renaming 2021-02-19 09:26:14 +01:00
rnhmjoj aafaf3ba97
nixos/docs: add section on renaming interfaces 2021-02-19 09:26:14 +01:00
rnhmjoj 7384c81e98
nixos/tests/networking: test interface renaming 2021-02-19 09:26:14 +01:00
rnhmjoj 8e59a682a5
nixos/udev: add option to install rules in initrd
Note: this moves the example rule used to rename network interfaces in
the new udev.initrdRules option, which is required since 115cdd1c.
2021-02-19 09:26:13 +01:00
zowoq 3dab057264 Merge staging-next into staging 2021-02-19 10:47:46 +10:00
Sandro Jäckel c75d7d2f8c
nixos/grub: fix editor check 2021-02-18 22:25:57 +01:00
rnhmjoj 65325292da
nixos/stage-1: install networkd link files
Renaming an interface must be done in stage-1: otherwise udev will
report the interface as ready and network daemons (networkd, dhcpcd,
etc.) will bring it up. Once up the interface can't be changed and the
renaming will fail.

Note: link files are read directly by udev, so they can be used even
without networkd enabled.
2021-02-18 22:07:00 +01:00
rnhmjoj 15d6eacb15
nixos/{networkd,dhcpcd}: remove udev-settle hack
systemd-udev-settle is a terrible hack[1] and should never[2] ever[3]
used, seriously it's very bad. It was used as a stop-gap solution for
issue #39069, but thanks to PR #79532 it can be removed now.

[1]: https://github.com/systemd/systemd/issues/7293#issuecomment-592941764
[2]: https://github.com/NixOS/nixpkgs/issues/73095
[3]: https://github.com/NixOS/nixpkgs/issues/107341
2021-02-18 22:07:00 +01:00
Dominik Xaver Hörl 0e8d7f9b3d nixos/install-grub: normalize whitespace 2021-02-18 20:51:34 +01:00
Maximilian Bosch 2ec9a72b80
Merge pull request #113584 from sternenseemann/openldap-tests
nixos/tests/openldap: fix evaluation when auto-called
2021-02-18 20:49:14 +01:00
Chuck 83de9e2d12 prometheus-systemd-exporter: Init at 0.4.0 2021-02-18 09:56:45 -08:00
Daniël de Kok 6e10cf2c1c
Merge pull request #108045 from mmilata/moinmoin-module-fix
nixos/moinmoin: fix module by switching to eventlet worker
2021-02-18 16:13:22 +01:00
Peter Hoeg c382780e9b nixos/bluetooth: fix more stupidity on my part
Say this 10 times so I don't forget:

 - just because something has been tested and confirmed working, doesn't
   mean that a trivial change can go in without testing simply because
   it looks OK. test, test, test.
 - just because something has been tested and confirmed working, doesn't
   mean that a trivial change can go in without testing simply because
   it looks OK. test, test, test.
 - just because something has been tested and confirmed working, doesn't
   mean that a trivial change can go in without testing simply because
   it looks OK. test, test, test.
 - just because something has been tested and confirmed working, doesn't
   mean that a trivial change can go in without testing simply because
   it looks OK. test, test, test.
 - just because something has been tested and confirmed working, doesn't
   mean that a trivial change can go in without testing simply because
   it looks OK. test, test, test.
 - just because something has been tested and confirmed working, doesn't
   mean that a trivial change can go in without testing simply because
   it looks OK. test, test, test.
 - just because something has been tested and confirmed working, doesn't
   mean that a trivial change can go in without testing simply because
   it looks OK. test, test, test.
 - just because something has been tested and confirmed working, doesn't
   mean that a trivial change can go in without testing simply because
   it looks OK. test, test, test.
 - just because something has been tested and confirmed working, doesn't
   mean that a trivial change can go in without testing simply because
   it looks OK. test, test, test.
 - just because something has been tested and confirmed working, doesn't
   mean that a trivial change can go in without testing simply because
   it looks OK. test, test, test.

I'm sorry guys.
2021-02-18 14:54:19 +00:00
sohalt 725966b870 nixos/spacenavd: init 2021-02-18 15:08:20 +01:00
sternenseemann 281a2401b2 nixos/tests/openldap: make openldap test auto-callable
The NixOS manual documents that you can invoke every tests using

    nix-build path/to/nixos/tests/test.nix

which was not the case for openldap since it is not autocallable, but
requires pkgs and system as arguments. Usually, make-test-pythons.nix
takes care of this if it is imported at the top-level, but since
openldap.nix contains multiple tests, this was not the case.

This is however easily fixed by:

* Adding default values for the pkgs and system arguments based on the
  definition in make-test-python.nix
* Passing pkgs and system explicitly to make-test-python.nix to ensure
  the pkgs and system values passed from all-tests.nix are used.
2021-02-18 13:04:08 +01:00
Dominik Xaver Hörl 3629c74c10 nixos/rl-2105: document removal of systemConfig parameter 2021-02-18 12:48:08 +01:00
Dominik Xaver Hörl 61d746a7d3 nixos: don't set systemConfig for stage-2
Since c4f910f550, this is no longer
needed, because stage-2 is already generated with the path hard wired anyway.
2021-02-18 12:48:08 +01:00
Arian van Putten 5276ebb5ee nixos: Get rid of systemConfig kernel parameter
It was introduced in c10fe14 but removed in c4f910f.

It remained such that people with older generations in their boot
entries could still boot those. Given that the parameter hasn't had any
use in quite some years, it seems safe to remove now.

Fixes #60184
2021-02-18 12:48:08 +01:00
Jacek Galowicz bc7a369c68
Merge pull request #112961 from r-burns/nixos-test-grub
nixosTests.installer: fix non-zfs grub tests
2021-02-18 11:58:57 +01:00
Ryan Burns 5406db08bf nixosTests.installer: increase EFI partition size
Needed for simpleUefiGrub test to pass on aarch64
Runs out of space otherwise
2021-02-18 01:58:25 -08:00
Sandro Jäckel 754a8db42d
nixos/printing: remove google cloud print 2021-02-18 02:21:38 +01:00
Aaron Andersen 4b9262786d nixos/mysql: properly configure mariadb for galera recovery 2021-02-17 15:50:20 -05:00
github-actions[bot] 9d6726a2e3
Merge staging-next into staging 2021-02-17 18:14:09 +00:00
github-actions[bot] afcea01614
Merge master into staging-next 2021-02-17 18:14:04 +00:00
Eelco Dolstra dd63561bcb Remove ripgrep test
VM tests are expensive (and prone to random failures) so they should
only be used for things that can only be tested in a VM, not for
things that could be tested in a regular checkPhase or derivation.
2021-02-17 17:57:09 +01:00
Maximilian Bosch 910e103fcb
Merge pull request #113323 from witchof0x20/nextcloud_redirect_fix
nixos/nextcloud: DAV .well-known redirect fix
2021-02-17 17:23:35 +01:00
Francesco Gazzetta d56f72178e nixos/mlmmj: use appropriate postfix options
instead of extra*

should make the module more interoperable with others
2021-02-17 16:00:59 +00:00
Francesco Gazzetta 7596e7a495 nixos/mlmmj: add more list headers
since we already add a couple of default headers, it makes sense to have
a sensible default and add the unsubscribe header and friends
2021-02-17 15:59:06 +00:00
Justin Humm 40f60919ab nixos/mastodon: fix group membership for nginx
4255954d97 set the StateDirectory to 0750,
but nginx wasn't in the Mastodon group. This commit also deletes a line,
that probably was intended to serve this purpose, but makes no sense.
Why should the Mastodon user be added as an extraGroup to the nginx
user?
2021-02-17 15:16:14 +01:00
github-actions[bot] 41b30ed9a6
Merge staging-next into staging 2021-02-17 12:20:08 +00:00
github-actions[bot] f68cf6f574
Merge master into staging-next 2021-02-17 12:20:00 +00:00
Matt Snider 58058515a3
nixos/etesync-dav: init module 2021-02-17 10:43:08 +01:00
ilian 29a6c9b9a3 nixos/hypervGuest: add Microsoft Synthetic Keyboard driver
Ensure that the HyperV keyboard driver is available in the early
stages of the boot process. This allows the user to enter a disk
encryption passphrase or repair a boot problem in an interactive
shell.
2021-02-17 08:01:34 +00:00
Jörg Thalheim 9783fa9554
Merge pull request #110615 from jansol/pipewire 2021-02-17 07:41:27 +00:00
github-actions[bot] cd9df16806
Merge staging-next into staging 2021-02-17 06:14:55 +00:00
github-actions[bot] 3ed237717a
Merge master into staging-next 2021-02-17 06:14:47 +00:00
Peter Hoeg bf11a28bd3 nixos/bluetooth: hotfix for stupidity 2021-02-17 05:58:08 +00:00
Peter Hoeg 1a4c039432 nixos/bluetooth: add support for disabling plugins 2021-02-17 02:40:59 +00:00
github-actions[bot] 3e0ef2752a
Merge staging-next into staging 2021-02-17 00:36:34 +00:00
github-actions[bot] 79b7a67b55
Merge master into staging-next 2021-02-17 00:36:31 +00:00
WORLDofPEACE 8a2bd1342e
Merge pull request #113064 from worldofpeace/fix-108124
nixos/tools: make desktopConfiguation types.listOf types.lines
2021-02-16 15:16:53 -05:00
github-actions[bot] c0f4dcb71d
Merge staging-next into staging 2021-02-16 18:17:00 +00:00
github-actions[bot] 287495a7aa
Merge master into staging-next 2021-02-16 18:16:57 +00:00
Jade f83d4f86d5
Nextcloud redirect fix 2021-02-16 11:58:38 -05:00
Izorkin 96f0c2c191 mastodon, nixos/mastodon: use the same nodejs package in package and module 2021-02-16 17:57:31 +01:00
Julien Langlois f3828c53c9
nixos/services/kmscon: fix systemd configuration
This fixes https://github.com/NixOS/nixpkgs/issues/112616
2021-02-15 16:58:54 -05:00
Matej Urbas a6766bee7b virtualization/amazon-init: enable option 2021-02-15 18:44:34 +00:00
github-actions[bot] e88fb2d10c
Merge staging-next into staging 2021-02-15 18:17:10 +00:00
github-actions[bot] 0ca7d945c2
Merge master into staging-next 2021-02-15 18:17:06 +00:00
Maximilian Bosch 274109a8d6
Merge pull request #113108 from Ma27/nextcloud-acme
nixos/nextcloud: fix regex to not return 404 on ACME challenges
2021-02-15 18:53:35 +01:00
Maximilian Bosch 31864de85d
Merge pull request #113187 from Ma27/nextcloud-dav
nixos/nextcloud: redirect /.well-known/*dav to https url
2021-02-15 18:53:19 +01:00
Leonard Pollak a9a100adf6 nixos/ceph: fix ceph.client.extraOptions type 2021-02-15 14:56:26 +01:00
github-actions[bot] a1d9d57051
Merge staging-next into staging 2021-02-15 12:20:16 +00:00
github-actions[bot] cd518a718b
Merge master into staging-next 2021-02-15 12:20:12 +00:00
Lassulus 2489d95c1c
Merge pull request #110627 from 4z3/use-real-user-name-for-per-user-packages
nixos/users: use proper name for per-user packages
2021-02-15 12:45:24 +01:00
Izorkin e3a7270e3d nixos/mastodon: fix mastodon-init-db script 2021-02-15 11:43:03 +01:00
Izorkin 4255954d97 nixos/mastodon: optimize permissions 2021-02-15 11:43:03 +01:00
Izorkin 424e7b0f5d nixos/mastodon: use unix socket to default 2021-02-15 11:43:03 +01:00
Izorkin f1adea1a94 nixos/mastodon: add option trustedProxy 2021-02-15 11:43:03 +01:00
Maximilian Bosch f89652a23e
nixos/nextcloud: redirect /.well-known/*dav to https url
Fixes #113155
2021-02-15 11:03:12 +01:00
github-actions[bot] 018f748b81
Merge staging-next into staging 2021-02-15 00:37:07 +00:00
github-actions[bot] 0630986bf7
Merge master into staging-next 2021-02-15 00:37:03 +00:00
Jan Solanti 3d69688289 pipewire: rename pwms to media-session 2021-02-14 23:54:23 +02:00
Jan Solanti b9b9fff6d6 pipewire: use strictly upstream defaults 2021-02-14 23:54:17 +02:00
Aaron Andersen 796e3d6ff6
Merge pull request #111695 from jansol/xow
xow: fix service
2021-02-14 13:32:55 -05:00
github-actions[bot] 056f697397
Merge staging-next into staging 2021-02-14 18:16:17 +00:00
github-actions[bot] 4f3b8e7b41
Merge master into staging-next 2021-02-14 18:16:14 +00:00
Luke Granger-Brown bfc11c643d nixos/tests/ceph-single-node-bluestore: init
The current Ceph tests use the old method for OSDs to store data on
disks, known as Filestore. This means there are no tests for the
Bluestore functionality that run on install, which means that things
like RocksDB being broken can slip through and break the Bluestore
functionality in a subtle and difficult to debug manner.

Add a test to check that Bluestore works, at least on a single node.
2021-02-14 18:05:57 +00:00
Jean-Paul Calderone 9338023577
Fix typo in the GitLab smtp auth options docs 2021-02-14 09:55:54 -05:00
Maciej Krüger 8429831b67
Merge pull request #112746 from mkg20001/qemu-extra-disks 2021-02-14 13:20:44 +01:00
Maciej Krüger 59eb6d3ee3
nixosTests.*: update to use virtualisation.fileSystems 2021-02-14 12:23:50 +01:00
Maximilian Bosch 055b7e2a5d
nixos/nextcloud: fix regex to not return 404 on ACME challenges
Fixes #113027
2021-02-14 12:23:16 +01:00
github-actions[bot] 45fadd9b7f
Merge staging-next into staging 2021-02-14 00:37:59 +00:00
github-actions[bot] 8d8fe35281
Merge master into staging-next 2021-02-14 00:37:56 +00:00
pasqui23 04ef00987a
nixos/switcheroo-control: add to modules-list.nix (#113052) 2021-02-14 01:06:01 +01:00
WORLDofPEACE 452f7e14d4 nixos/tools: generate an xserver config
The desktop configuration won't enable xserver.
If there's multiple desktops enabled they will now evaluate properly.
2021-02-13 18:46:01 -05:00
WORLDofPEACE 94f0210e60 nixos/tools: make desktopConfiguation types.listOf types.lines
This fixes #108124.
2021-02-13 18:45:27 -05:00
Martin Weinelt 286f8cdbfc Merge branch 'master' into staging-next 2021-02-14 00:40:47 +01:00
zowoq 37f1ed7ca4 nixos/podman: install systemd files
- install podman service and socket
- install podman tmpfile
2021-02-14 06:57:39 +10:00
github-actions[bot] d10b7b45fb
Merge staging-next into staging 2021-02-13 18:16:03 +00:00
github-actions[bot] 1c7975a26f
Merge master into staging-next 2021-02-13 18:15:59 +00:00
Ninjatrappeur 2f80425e6e
Merge pull request #112801 from erosennin/prosody-tests
nixos/prosody: fix broken tests
2021-02-13 15:22:48 +01:00
Milan 3b77e7c967
nixos/jitsi-videobridge: add apis option (#112960)
The `--apis=` command line parameter passed to Jitsi Videobridge is
required to monitor a Jitsi Meet instance for example via the prometheus
exporter [jitsiexporter](https://git.xsfx.dev/prometheus/jitsiexporter).
2021-02-13 15:04:58 +01:00
github-actions[bot] 37c77840b8
Merge staging-next into staging 2021-02-13 12:19:41 +00:00
github-actions[bot] 257f90a43f
Merge master into staging-next 2021-02-13 12:19:38 +00:00
Jörg Thalheim c875e8e673
Merge pull request #107394 from yorickvP/beam-nox 2021-02-13 09:01:06 +00:00
github-actions[bot] 1e189fbb9e
Merge staging-next into staging 2021-02-13 06:16:37 +00:00
github-actions[bot] 318f95e4c2
Merge master into staging-next 2021-02-13 06:16:33 +00:00
aszlig 2d5a31a3ef
Merge pull request #112819 (mkIf in systemd units)
@thelegy writes:

  unitOption is only used inside of attrsOf wich is perfectly capable of
  handling the attrsets from mkIf, though the checkUnitConfig test
  forbids it.

  This commit weakens that restriction to allow the usage of mkIf inside
  of systemd.services.<name>.serviceConfig.<something> etc.

While I personally don't like that we can't easily use
pushDownProperties from the module system and need to rely on internals,
we *already* use internals for the mkOverride case, so adding another
case for mkIf doesn't add a hard-to-find indirection.

I'm merging this, since this fixes a valid use case and it shouldn't
make refactoring worse than before.
2021-02-13 05:24:11 +01:00
Ryan Burns 5828d54356 nixosTests.installer: fix non-zfs grub tests
Now that grub2 is built without zfs support when possible, this is a
separate store path which may need to be made available to the installer.
2021-02-12 19:39:17 -08:00
github-actions[bot] c4d734932d
Merge staging-next into staging 2021-02-13 00:36:15 +00:00
github-actions[bot] 1d62dc37db
Merge master into staging-next 2021-02-13 00:36:11 +00:00
Luke Granger-Brown cfed3b8b22 treewide: update 21.03 to 21.05
The NixOS 21.03 release has been delayed to 21.05. See NixOS/rfcs#80.

There are two instances of 21.03 which have been left as is, since they
are in stateVersion comparisons. This will ensure that existing user
configurations which refer to 21.03 will continue to work.
2021-02-12 14:12:48 -08:00
erictapen b2dbb4f50e
nixos/mastodon: set environment for mastodon-init-dirs (#112917)
mastodon-init-dirs should have the same environment as the other
services, as it also calls rake. Especially RAILS_ENV was missing.
2021-02-12 20:31:44 +01:00
github-actions[bot] 0667f269fc
Merge staging-next into staging 2021-02-12 18:16:50 +00:00
github-actions[bot] b23b455f9a
Merge master into staging-next 2021-02-12 18:16:46 +00:00
Milan Pässler 4d6bfa473a
nixos/mastodon: init
Co-authored-by: Happy River <happyriver93@runbox.com>
Co-authored-by: ash lea <ashkitten@users.noreply.github.com>
Co-authored-by: Justin Humm <justin.humm@posteo.de>
2021-02-12 15:37:15 +00:00
github-actions[bot] 53c1035b44
Merge staging-next into staging 2021-02-12 12:20:24 +00:00
github-actions[bot] 15db604744
Merge master into staging-next 2021-02-12 12:20:20 +00:00
Florian Klink 53a0c2878b
Merge pull request #111786 from flokli/systemd-247.3
systemd: 247.2 -> 247.3
2021-02-12 12:52:49 +01:00
Michael Raskin 27f172ebd1
Merge pull request #112019 from 7c6f434c/fix-service-runner
nixos/service-runner: fix evaluation
2021-02-12 08:50:52 +00:00
Peter Hoeg 04e9e9e510 nixos/captive-browser: make it work without a fixed interface
nixpkgs-fmt makes this a lot noisier than it has to be
2021-02-12 14:35:51 +08:00
github-actions[bot] 1551e9d6ee
Merge master into staging-next 2021-02-12 06:16:24 +00:00
Andrey Golovizin 3fd5a41676 nixos/prosody: fix broken tests 2021-02-12 06:54:20 +01:00
Mario Rodas ffedd32f9f
Merge pull request #108511 from nagy/apache-lua-path-fix
nixos/httpd: fix lua paths
2021-02-11 20:04:42 -05:00
github-actions[bot] 344456f66a
Merge master into staging-next 2021-02-12 00:36:19 +00:00
Kevin Cox 4a22f8aa88
Merge pull request #112660 from turion/dev_test_vscodium
tests/vscodium: Fix race condition
2021-02-11 17:49:14 -05:00
Jan Beinke 97718a3584
nixos/systemd-lib: allow mkIf in unitOption
`unitOption` is only used inside of `attrsOf` wich is perfectly capable of
handling the attrsets from `mkIf`, though the checkUnitConfig test
forbids it. This commit weakens that restriction to allow the usage of
`mkIf` inside of `systemd.services.<name>.serviceConfig.<something>`
etc.
2021-02-11 22:18:21 +01:00
Louis Blin 458fafa8fc nixos/prometheus-exporters/artifactory: init at 1.9.0
Adds a Prometheus exporter to scrape metrics from the API of JFrog
Artifactory instances.
2021-02-11 15:56:58 +00:00
Daniel Nagy 7c121e60c5
nixos/httpd: fix lua paths
Account for the fact that, when creating a lua package without the
"withPackages" helper, we dont get an extra "lua" attribute in the
package.

Therefore we need to distinguish between the "withPackages" case and the
direct ( or "empty" ) lua package.

For example with this nixos config:

```nix
{
  services.httpd = {
      enable = true;
      package = pkgs.apacheHttpd.override {
        luaSupport = true;
        lua5 = pkgs.lua5_3.withPackages (ps: with ps; [ luafilesystem ] );
      };
    };
}
```

Here we say that we want to have apache to use a lua, packaged with the
`luafilesystem` module so that we can `require` that in scripts to
render http responses. There, the set that gets assigned to `lua5 ` does
not have a `luaversion` attribute, rather it has a `lua` attribute
wherein lies a `luaversion` attribute. If we dont package additional
modules, then we dont have that `lua` attribute in between and rather
directly have to use `luaversion` directly.
2021-02-11 11:56:06 +01:00
Maciej Krüger 45b8e83128
qemu-vm: add virtualisation.fileSystems to allow extra vm mounts 2021-02-11 11:02:45 +01:00
github-actions[bot] 5f9df37683
Merge master into staging-next 2021-02-11 00:36:09 +00:00
Ingo Blechschmidt b481663125 nixos/whitebophir: expose new option provided by whitebophir 1.8.0 2021-02-10 23:33:02 +01:00
Linus Heckemann e4cf0e7a45
Merge pull request #109345 from cole-h/zfs-closure
Shrink the ZFS closure by making mail support optional
2021-02-10 23:04:24 +01:00
Andrey Golovizin 1f3c9fd0ef nixos/tests/networking: fix DHCP range
Exclude static 192.168.*.2 addresses from the dynamic address range to
prevent different interfaces from getting the same address.

Seems like configuring a fixed IPv4 address does not automatically
exclude it from the dynamic address range.

Should fix occasional failures of
nixos.tests.networking.scripted.macvlan and possibly other networking
tests relying on DHCP.
2021-02-10 20:33:49 +01:00
github-actions[bot] 7d94bb26bb
Merge master into staging-next 2021-02-10 18:16:36 +00:00
Manuel Bärenz 037d0489ca tests/vscodium: Fix race condition 2021-02-10 16:38:13 +01:00
Finn Behrens 92859ff489 nixos/prometheus-flow-exporter: init module 2021-02-10 14:29:05 +01:00
github-actions[bot] bb5521a62c
Merge master into staging-next 2021-02-10 12:20:06 +00:00
Robert Hensing 696294ea9f Improve todo 2021-02-10 10:36:00 +01:00
Robert Hensing 460ba46a4a nixos/hercules-ci-agent: Add myself to meta.maintainers 2021-02-10 09:50:27 +01:00
Robert Hensing 0c22957751 nixos/hercules-ci-agent: Improve concurrentTasks option doc 2021-02-10 09:49:57 +01:00
Robert Hensing fbabab7b16 nixos/hercules-ci-agent: Format with nixpkgs-fmt 2021-02-10 09:49:21 +01:00
github-actions[bot] 459eb2d924
Merge master into staging-next 2021-02-10 06:16:56 +00:00
Aaron Andersen 5473527775
Merge pull request #111312 from fdietze/patch-2
herbstluftwm: Add option to specify package
2021-02-09 20:13:03 -05:00
github-actions[bot] 8064cff79c
Merge master into staging-next 2021-02-09 18:16:33 +00:00
Ben Siraphob e605e6205f power-profiles-daemon: pkgs.stdenv.lib -> pkgs.lib 2021-02-09 18:24:09 +07:00
Felix Dietze 5a827051aa herbstluftwm: Add option to specify package 2021-02-09 08:51:21 -01:00
github-actions[bot] 30dddce5e8
Merge master into staging-next 2021-02-09 06:16:02 +00:00
Martin Weinelt 2b454fcefd
Merge pull request #112391 from serokell/zhenya/oauth2-proxy-multiple-hosts
nixos/oauth2_proxy_nginx: specify hostname in X-Auth-Request-Redirect
2021-02-09 02:37:03 +01:00
Bernardo Meurer c83a3d6fa7
Merge pull request #112335 from lovesegfault/firefox-no-flash
treewide: cleanup Adobe Flash Player
2021-02-09 01:35:24 +00:00
Martin Weinelt 47901b544c
Merge pull request #111302 from fooker/pr/nginx-default-type
nixos/nginx: serve unknown MIME-Types as binary
2021-02-09 01:44:47 +01:00
Jan Tojnar faf133f854
Merge pull request #97972 from mvnetbiz/power-profiles-daemon 2021-02-09 01:41:04 +01:00
github-actions[bot] 5704fd1095
Merge master into staging-next 2021-02-09 00:36:17 +00:00
Matt Votava 65968a1f59
power-profiles-daemon: add test 2021-02-09 01:25:57 +01:00
Matt Votava 9a3190a960
power-profiles-daemon: init at 0.1, add service module 2021-02-09 01:25:56 +01:00
Guillaume Girol 2630a2df91
Merge pull request #108238 from snicket2100/more-dnscrypt-proxy-hardening
nixos/dnscrypt-proxy2: more service hardening
2021-02-08 19:22:44 +00:00
Robert Hensing 094362a35a
Merge pull request #112154 from hercules-ci/nixos-hercules-ci-agent-remove-patchNix
nixos/hercules-ci-agent: Remove patchNix
2021-02-08 19:21:00 +01:00
github-actions[bot] 1848e071c9
Merge master into staging-next 2021-02-08 18:17:03 +00:00
Bernardo Meurer 77a76e2ff8
release-notes/rl-2103: mention removal of flashplayer support from tree 2021-02-08 09:40:20 -08:00
Bernardo Meurer ecaefda84a
nixos.flashpolicyd: drop 2021-02-08 09:38:48 -08:00
Manuel Bärenz 6ee5348b55 nixos/tests: add keepassxc
Test whether KeePassXC launches correctly.
2021-02-08 15:39:37 +01:00
Manuel Bärenz 10b3773db0 vscode/vscodium: Add integration test 2021-02-08 13:59:37 +01:00
Zhenya Vinogradov cc26d8592f nixos/oauth2_proxy_nginx: specify hostname in X-Auth-Request-Redirect
Fixes redirection after signing in when you use a single oauth2_proxy
instance for multiple domains.

X-Auth-Request-Redirect header is used to decide which URL to redirect
to after signing in. Specifying `request_uri` is enough in case you
need to redirect to the same domain that serves oauth2 callback
endpoint, but with multiple domains the you should include the scheme
and the host.
2021-02-08 15:28:52 +03:00
github-actions[bot] bef005163c
Merge master into staging-next 2021-02-08 12:19:33 +00:00
Michele Guerini Rocco c9f6a7f349
Merge pull request #111624 from rnhmjoj/thinkfan
nixos/thinkfan: rewrite for 1.2 update
2021-02-08 12:20:07 +01:00
WilliButz bfa15ad956
Merge pull request #112351 from logan12358/prometheus-nginx-exporter-service
nixos/prometheus-nginx-exporter: only create service if nginx exporter is enabled
2021-02-08 11:54:13 +01:00
Jörg Thalheim c538a83d7c
Merge pull request #110623 from yurrriq/beam-team 2021-02-08 06:48:14 +00:00
github-actions[bot] 1c86cb40e9
Merge master into staging-next 2021-02-08 00:36:16 +00:00
Logan Glasson c6ec272c78 nixos/prometheus-nginx-exporter: only create service if nginx exporter is enabled
On a system with nginx enabled but the prometheus exporter not enabled,
the prometheus-nginx-exporter service should not be created.
2021-02-08 13:17:56 +13:00
Jan Beinke c4b5a703ab
tests/snapserver: Add test of connection and buffer size setting
This addition will cover part of the issue, that was fixed in #112295
and @mweinelt asked to improve the tests.
2021-02-07 23:43:59 +01:00