Commit graph

26287 commits

Author SHA1 Message Date
Michal Sojka
611e9302f9 nixos-rebuild: add --no-flake switch
When a NixOS system uses flakes, i.e., /etc/nixos/flake.nix exists, it
is impossible to use nixos-rebuild to build a pre-flake
configuration.nix. Of course, one can directly use nix command to
build the configuration, but not everybody remembers the correct nix
options to do that.

With the new option, it is possible to build a pre-flake configuration
with command like this:

    nixos-rebuild build-vm -I nixos-config=./vm.nix --no-flake

The option might be useful for people following older pre-flake
tutorials on a flake-based system.
2022-03-22 19:03:10 +01:00
Benjamin Staffin
d6f50a5c8e keycloak: fix a missing newline when using plugins 2022-03-22 12:36:14 -04:00
aszlig
de4a69b2de
nixos/tests/avahi: Fix running background command
In https://github.com/NixOS/nixpkgs/pull/142747, the implementation
behind Machine.execute() has been changed to pipe all the command's
output into base64 on the guest machine.

Unfortunately this means that base64 is blocking until stdout is closed,
which in turn means that we now need to make sure that whenever we run a
program in background via "&" we also need to make sure to close stdout,
which we do by redirecting stdout to stderr.

Signed-off-by: aszlig <aszlig@nix.build>
2022-03-22 17:24:13 +01:00
Jacek Galowicz
6567abf122
Merge pull request #165268 from vkleen/nixos/tests/deduplicate-vlans
nixos/test-driver: deduplicate VLANs
2022-03-22 14:53:31 +01:00
Sivizius
b4c2ffaffa
nixos/wg-quick: add autostart option to interfaces (#162219)
This adds the option `networking.wg-quick.interfaces.<name>.autostart`, which defaults to `true`, which is the previous behavior. With this option set to `false`, the systemd-unit will no longer be set to `wantedBy = [ "multi-user.target" ]` and therefore the tunnel has to be enabled/disabled via `systemctl start/stop wg-quick-<name>`.

Co-authored-by: pennae <82953136+pennae@users.noreply.github.com>
2022-03-22 13:25:57 +00:00
Viktor Kleen
6d766ae8b7
nixos/test-driver: deduplicate VLANs
Naively deduplicate VLANs in the python driver for NixOS tests. The
current implementation accidentally works, since the VLan class mutates
the environment. On construction it sets QEMU_VDE_SOCKET_${id} and this
environment variable gets overwritten once a second VLAN with the same
id is constructed. Because the NIC flags passed to qemu just use the
QEMU_VDE_SOCKET_${id} environment variable, this implicitly chooses a
single vde_switch process for each VLAN.

However, this leads to unusable vde_switch processes being spawned in
each test run and as a side effect makes it impossible to access the
correct VLan objects in the interactive test driver. It also makes it
remarkably hard to understand why the current implementation ever
worked.
2022-03-22 13:16:28 +00:00
Kevin Cox
954f445608
Merge pull request #165252 from Luflosi/ipfs-hardening
nixos/ipfs: add systemd hardening
2022-03-22 08:10:01 -04:00
Peter Hoeg
052632fd15 nixos/iwd: workaround for race condition where wlan device disappears 2022-03-22 19:36:51 +08:00
Luflosi
41d45d674a
nixos/ipfs: add systemd hardening
Use the hardened systemd unit from upstream.
2022-03-22 11:12:14 +01:00
K900
1dbc26d995 nixos/pipewire: unbreak mixed Pulse/Pipewire setups
Fixes #163066
2022-03-22 11:29:46 +03:00
Artturi
6134c2f891
Merge pull request #161034 from andr1an/fix/nixos-generate-config-absolute-root-path 2022-03-22 02:35:06 +02:00
Benjamin Staffin
34006ebc9d Merge remote-tracking branch 'origin/master' into mvn 2022-03-21 18:37:45 -04:00
Robert Hensing
6c469679f6 Merge remote-tracking branch 'upstream/master' into tests-restrict-arguments 2022-03-21 23:17:17 +01:00
Robert Hensing
eb8b70c020 nixos: Make config.nix.enable pass test 2022-03-21 23:14:10 +01:00
Kevin Cox
18307675b9
Merge pull request #153091 from GoogleBot42/master
nvidia: Fix AMD APU for Prime Sync
2022-03-21 15:04:38 -04:00
Jörg Thalheim
9b2939da63
Merge pull request #164260 from Mic92/nix-ld
nix-ld: init at 1.0.0 + nixos module
2022-03-21 18:42:38 +00:00
Pascal Bach
4c3c80df54
Merge pull request #114393 from DarkDNA/feature/samba/network-online
nixos/samba: Add a wants=network-online.target to the target.
2022-03-21 19:25:50 +01:00
Maciek Starzyk
55d462eea9 miller: 5.10.3 -> 6.2.0 2022-03-21 19:04:25 +01:00
Googlebot
4007aa201b Merge remote-tracking branch 'upstream/master' 2022-03-21 11:32:36 -04:00
Kevin Cox
8ce16fcf62
Merge pull request #163451 from hercules-ci/stop-premature-warnings
Stop premature warnings, including `nix.settings` migration
2022-03-21 10:10:40 -04:00
Florian Klink
9427a17ccb
Merge pull request #164016 from bobvanderlinden/pr-refactor-systemd-module
nixos: systemd: split module up into multiple files
2022-03-21 13:03:55 +01:00
Bob van der Linden
397b8257a0
nixos: systemd-user: fix additionalUpstreamUserUnits description
Co-authored-by: Martin Weinelt <mweinelt@users.noreply.github.com>
2022-03-21 12:30:37 +01:00
Manuel Bärenz
9046ecff84
Merge pull request #163608 from turion/dev_fix_keepassxc_163482
nixosTests.keepassxc: Add regression test for #163482
2022-03-21 12:24:32 +01:00
Janne Heß
8e60f86840
Merge pull request #164034 from helsinki-systems/clean/stc
nixos/switch-to-configuration: Major script cleanup
2022-03-21 12:13:23 +01:00
Jörg Thalheim
35eb6cf711 nix-ld: mention in changelog 2022-03-21 11:15:32 +01:00
Jörg Thalheim
a98ea7e6f8 nix-ld: init at 1.0.0 + nixos module 2022-03-21 11:15:32 +01:00
Izorkin
41f28e9fbc nixos/tests: add mastodon test 2022-03-20 21:01:03 +01:00
Sandro
3d48fda6f5
Merge pull request #164330 from Luflosi/fix-tor-client-disable 2022-03-20 19:51:30 +01:00
Sandro
bf7837529e
Merge pull request #103733 from JJJollyjim/term-tests 2022-03-20 18:57:18 +01:00
Benjamin Staffin
81b63b6ef6
nixos/oauth2_proxy: add missing oidc providers (#164632)
- Add adfs and keycloak-oidc providrs
- Sort the list alphabetically
2022-03-20 13:31:43 -04:00
Artturi
8cfcf8c9a9
Merge pull request #156200 from B4dM4n/nixos-tests-wine 2022-03-20 17:37:38 +02:00
Bob van der Linden
92af44e04d
nixos: systemd: remove unhelpful comments in additionalUpstreamSystemUnits
Co-authored-by: Janne Heß <janne@hess.ooo>
2022-03-20 16:14:13 +01:00
Janne Heß
2473cce829
nixos/switchTest: Also test boot/switch actions 2022-03-20 13:04:24 +01:00
Janne Heß
85874efcb0
nixos/switch-to-configuration: Make perlcritic happy 2022-03-20 13:04:23 +01:00
Janne Heß
9c494b5773
nixos/switch-to-configuration: Snake-case all variables
Also add a lot of comments and reorder some assignments
2022-03-20 13:03:39 +01:00
Janne Heß
67f84b4b87
nixos/switch-to-configuration: Snake-case all subroutines and add comments 2022-03-20 13:03:19 +01:00
Janne Heß
23ea9965bb
nixos/switch-to-configuration: Enforce consistent quoting 2022-03-20 13:01:11 +01:00
Janne Heß
bdcd558812
nixos/switch-to-configuration: Get rid of all postfixes and unlesses 2022-03-20 13:01:11 +01:00
Janne Heß
5c00fe6b1b
nixos/switchTest: Also test the os-release parser 2022-03-20 13:01:11 +01:00
pennae
5b1fde773a
Merge pull request #163860 from delroth/synapse-rl-fix
matrix-synapse: fix release notes and doc for #158605 changes
2022-03-20 08:49:46 +00:00
Jamie McClymont
c9e1475085 nixos/tests/terminal-emulators: fix test for st
some change in the last 24 hours altered the behaviour of st such that
it now dies with a non-zero exit code when the shell exits, so kill is
now necessary
2022-03-20 16:48:06 +13:00
Vladimír Čunát
02f6f9c363
Merge #164895: nixos displayManager.session: drop type 2022-03-19 21:51:08 +01:00
Ninjatrappeur
05417a66e7
Merge pull request #164398 from NinjaTrappeur/nin/pleroma-wrappers 2022-03-19 21:28:40 +01:00
Vladimír Čunát
fd609f9233
nixos services.xserver.displayManager.session: drop type
For now at least.  I expect someone will find a working type later.
It's incorrect and was causing bad issues.  Example test case:
nix-instantiate nixos/release.nix -A tests.xfce.x86_64-linux --dry-run

This is a partial revert of commit b2d803c from PR #162271.
2022-03-19 21:11:41 +01:00
Stig
575ab73913
Merge pull request #163499 from Izorkin/update-peertube
peertube: 4.1.0 -> 4.1.1
2022-03-19 15:08:25 +01:00
Bob van der Linden
6514bb4620
nixos: systemd-user: make additionalUpstreamUserUnits internal 2022-03-19 12:06:56 +01:00
Bob van der Linden
66759cea7d
nixos: systemd-user: expand on additionalUpstreamUserUnits description 2022-03-19 12:06:43 +01:00
Naïm Favier
8f57dc38d9
fixup! nixos/testing: restrict arguments to makeTest 2022-03-19 11:51:39 +01:00
Artturi
2768178711
Merge pull request #164735 from lopsided98/nixos-enter-cleanup
nixos/nixos-enter: fix resolv.conf error handling and cleanup
2022-03-19 03:09:03 +02:00
Artturin
611b8c4472 nixos/nixos-generate-config: fix specifying --root /mnt --dir adir
it should save to `$PWD/adir` instead of `/mnt/adir`
and --dir adir should save to `$PWD/adir` instead of `/adir`
2022-03-18 23:16:19 +02:00
andr1an
00487b5a87 nixos/nixos-generate-config: resolve abspath to root 2022-03-18 23:16:06 +02:00
Ben Wolsieffer
69cff425e6 nixos/nixos-enter: cleanup resolv.conf handling 2022-03-18 12:19:09 -04:00
Ben Wolsieffer
1ee3d9477b nixos/nixos-enter: fix resolv.conf error handling 2022-03-18 12:19:02 -04:00
Manuel Bärenz
2ac527530e nixosTests.keepassxc: Add regression test for #163482 2022-03-18 16:47:34 +01:00
pennae
e8bfc4d4a8
Merge pull request #164367 from jpathy/patch-2
networking.greTunnels: support ip6gre*
2022-03-18 15:43:03 +00:00
Artturi
7958394022
Merge pull request #164624 from mart-w/fix/nixos/paperless-ng-fix-164615-consumation-bug
nixos/paperless-ng: fix #164615
2022-03-18 13:30:08 +02:00
pennae
201a32a1a7 unifi: unifi6 -> unifi7 2022-03-18 10:28:53 +01:00
Jamie McClymont
842e547c17 nixos/tests: add integration tests for terminal emulators 2022-03-18 19:49:13 +13:00
j-k
c12cec8bc3
_7zz: correct license (#163999)
* _7zz: correct license and remove p7zip dependency

The code under Compress/Rar* is licensed under a specific unRAR license
Also Compress/LzfseDecoder.cpp is covered by BSD3

The unRAR code is removed from the `.tar.xz` since the license posits you
agree or remove the code from your hard drive
This adds some complexity to updating 7zz so there is also an update
script

Meta has been updated and tweaked

Source is now downloaded from sourceforge in the `.tar.xz` version to
avoid depending on p7zip

* _7zz: add notice of the license updates and optional unRAR licenced code
2022-03-18 12:47:19 +08:00
Naïm Favier
ca8c877f8c
nixos/tests: fix some evaluation errors
Fixes errors caught by "nixos/testing: restrict arguments to makeTest" as
well as some unrelated errors and warnings.
2022-03-18 02:44:11 +01:00
Naïm Favier
79a234567c
nixos/testing: restrict arguments to makeTest
Disallow passing arbitrary arguments to makeTest since they are not
used; this can help catch mistakes.
2022-03-18 02:44:11 +01:00
Silvan Mosberger
839b9b8ddc
Merge pull request #77622 from R-VdP/nixos-upgrade-reboot-window
NixOS/auto-upgrade: offer the possibility to define a reboot window during which the system may be automatically rebooted
2022-03-17 23:50:53 +01:00
Bob van der Linden
753b911708
nixos: systemd-tmpfiles: use cfg shorthand 2022-03-17 23:16:38 +01:00
Bob van der Linden
38d043de9c
nixos: systemd: split off systemd-tmpfiles into separate module 2022-03-17 23:16:37 +01:00
Bob van der Linden
0e665d1815
nixos: systemd-user: allow additional upstream user units
Currently it is only possible to add upstream _system_ units. The option
systemd.additionalUpstreamSystemUnits can be used for this.

However, this was not yet possible for systemd.user. In a similar
fashion this was added to systemd-user.nix.

This is intended to have other modules add upstream units.
2022-03-17 23:16:37 +01:00
Bob van der Linden
b6d50528dd
nixos: systemd-user: use cfg shorthand 2022-03-17 23:16:37 +01:00
Bob van der Linden
022b4209a3
nixos: systemd: split off systemd-user into separate module 2022-03-17 23:16:37 +01:00
Bob van der Linden
cae8ef1232
nixos: systemd-coredump: use cfg shorthand 2022-03-17 23:16:30 +01:00
Bob van der Linden
ccfcb78a50
nixos: systemd: split off coredump into separate module 2022-03-17 23:15:49 +01:00
Bob van der Linden
7adc8ecac3
nixos: systemd-journald: use cfg shorthand 2022-03-17 23:13:36 +01:00
Bob van der Linden
fee1e24b3b
nixos: systemd: split off journald into separate module 2022-03-17 23:13:36 +01:00
Bob van der Linden
e2cb8903da
nixos: systemd-logind: use cfg shorthand 2022-03-17 23:13:27 +01:00
Bob van der Linden
c647002a94
nixos: systemd: split off logind into separate module 2022-03-17 23:12:00 +01:00
Bob van der Linden
0c94a512dd
nixos: systemd: avoid using "with systemdUtils.lib" 2022-03-17 21:52:54 +01:00
Bob van der Linden
3420dba80a
nixos: systemd: move systemd-nspawn to systemd/nspawn 2022-03-17 21:52:37 +01:00
Martin Wurm
fd2215b20c nixos/paperless-ng: fix #164615
Add an exception to the `paperless-ng-server` service's
`SystemCallFilter` as the `mbind` syscall is needed when consuming a
document while having a classification model present.
2022-03-17 19:35:20 +01:00
Félix Baylac-Jacqué
b205832efe nixos/pleroma: regenerate empty release cookie files
Since b9cfbcafdf0ca9573de1cdc06137c020e70e44a8, the lack of hexdump in
the closure lead to the generation of empty cookie files. This empty
cookie file is making pleroma to crash at startup now we correctly
read it.

We introduce a migration forcing these empty cookies to be
re-generated to something not empty.
2022-03-17 15:22:14 +01:00
Félix Baylac-Jacqué
e7f6370701 nixosTests.pleroma: fix test, remove toot patch
It was originally impossible to login in toot without having an
interactive shell. I opened https://github.com/ihabunek/toot/pull/180
upstream to fix that and fetch this patch for this test.

The author decided to fix the issue using a slightly different
approach at a3eb5dca24

Because of this upstream fix, our custom patch does not apply anymore.
Using that stdin-based login upstream feature.
2022-03-17 15:22:14 +01:00
Félix Baylac-Jacqué
71d9048f72 nixos/pleroma: inject release cookie path to the pleroma package
We inject the release cookie path to the pleroma derivation in order
to wrap pleroma_ctl with it. Doing this allows us to remove the
systemd-injected RELEASE_COOKIE path, which was sadly
buggy (RELEASE_COOKIE should point to the *content* of the cookie, not
the file containing it).

We take advantage of this to factor out the cookie path.
2022-03-17 15:22:14 +01:00
jpathy
0a62de4cd5 networking.greTunnels: support ip6gre* 2022-03-17 17:59:36 +05:30
Luflosi
7867b9506b
nixos/doc/rl-22.05: add changelog entry for modprobe changes
Add a changelog entry for the changes in 3dc6fab5c9.
2022-03-17 12:56:04 +01:00
Luflosi
47b699fe6c
Revert "nixos/modprobe: add boot.initrd.extraModprobeConfig option"
This reverts commit 1c58cdbeed, since this change was made redundant by 3dc6fab5c9 and in https://github.com/NixOS/nixpkgs/pull/145013 we decided to revert this commit.
2022-03-17 12:56:02 +01:00
Robert Hensing
0395086d0c
Merge pull request #162271 from Infinisil/warn-no-type
Throw an error for options without a type
2022-03-16 22:58:45 +01:00
Pavol Rusnak
0fcf66c74a
Merge pull request #164268 from MrMebelMan/update/kratos
kratos: 0.8.0-alpha.3 -> 0.8.3-alpha.1.pre.0
2022-03-16 22:45:10 +01:00
Sandro
99f75e17d3
Merge pull request #164270 from alyssais/locate-pruneNames 2022-03-16 21:17:48 +01:00
Robert Hensing
e98ae78636
Merge pull request #164317 from bobvanderlinden/pr-move-systemd-fns-lib
nixos: systemd: split off helper functions into systemd-lib
2022-03-16 21:05:12 +01:00
Maximilian Bosch
5226029af8
Merge pull request #164313 from Ma27/drop-nextcloud21
nextcloud21: remove
2022-03-16 17:59:53 +01:00
Artturi
b734f40478
Merge pull request #154004 from illustris/hadoop 2022-03-16 14:05:56 +02:00
Alyssa Ross
a65930ca21
nixos/locate: disable default findutils pruneNames
It doesn't make sense to have a default value for this that's
incompatible with the default locate implementation.  It means that
just doing services.locate.enable = true; generates a warning, even if
you don't care about pruning anything.  So only use the default prune
list if the locate implementation supports it (i.e., isn't findutils).
2022-03-16 11:06:38 +00:00
Alexander Bantyev
1e49b301b9
Merge pull request #164068 from cab404/master
os-release: preserve fields from being excessively quoted
2022-03-16 07:46:16 +03:00
Silvan Mosberger
47f2ee3d55
Merge pull request #160075 from ConnorBaker/spark_3_2_1
spark: init 3.2.1 and test on aarch64-linux
2022-03-16 02:13:03 +01:00
Ryan Mulligan
0ab73f9a3f
Merge pull request #162535 from astro/pacemaker
pacemaker: init
2022-03-15 16:06:56 -07:00
Luflosi
1b34039b5f
nixos/tor: fix services.tor.client.enable = false not working
If `services.tor.client.enable` is set to false (the default), the `SOCKSPort` option is not added to the torrc file but since Tor defaults to listening on port 9050 when the option is not specified, the tor client is not actually disabled. To fix this, simply set `SOCKSPort` to 0, which disables the client.
Use `mkForce` to prevent potentially two different `SOCKSPort` options in the torrc file, with one of them being 0 as this would cause Tor to fail to start. When `services.tor.client.enable` is set to false, this should always be disabled.
2022-03-15 23:39:02 +01:00
Bob van der Linden
9bc093b30a
nixos: systemd: split off helper functions into systemd-lib 2022-03-15 21:52:13 +01:00
Maximilian Bosch
15876a546c
nextcloud21: remove
EOLed by upstream in 2022-02[1].

[1] https://docs.nextcloud.com/server/23/admin_manual/release_schedule.html#older-versions
2022-03-15 21:26:46 +01:00
Jan Tojnar
0f94c5b151
Merge pull request #164105 from ncfavier/ibus
ibus: 1.5.24 -> 1.5.26
2022-03-15 21:24:52 +01:00
Sandro
0b88ca814f
Merge pull request #161818 from Luflosi/fix-tor-read-resolv.conf 2022-03-15 19:23:13 +01:00
Franz Pletz
018a959be7
Merge pull request #160750 from Izorkin/update-prosody 2022-03-15 19:07:15 +01:00
Luflosi
3c63da7cf8
nixos/tor: allow tor to read resolv.conf when using resolved
When `services.resolved.enable` is set to true, the file /etc/resolv.conf becomes a symlink to /etc/static/resolv.conf, which is a symlink to /run/systemd/resolve/stub-resolv.conf. Without this commit, tor does not have access to this file thanks to systemd confinement. This results in the following warning when tor starts:
```
[warn] Unable to stat resolver configuration in '/etc/resolv.conf': No such file or directory
[warn] Could not read your DNS config from '/etc/resolv.conf' - please investigate your DNS configuration. This is possibly a problem. Meanwhile, falling back to local DNS at 127.0.0.1.
```
To fix this, simply allow read-only access to the file when resolved is in use.
According to https://github.com/NixOS/nixpkgs/pull/161818#discussion_r824820462, the symlink may also point to /run/systemd/resolve/resolv.conf, so allow that as well.
2022-03-15 15:16:14 +01:00
Vladyslav Burzakovskyy
df2327ee24 kratos: 0.8.0-alpha.3 -> 0.8.3-alpha.1.pre.0 2022-03-15 14:38:14 +01:00