Commit Graph

26284 Commits

Author SHA1 Message Date
Doron Behar
4a02c56a7d
Merge pull request #164746 from ncfavier/makeWrapper-chdir 2022-03-24 13:51:27 +02:00
github-actions[bot]
c80dabe3b1
Merge staging-next into staging 2022-03-23 06:01:55 +00:00
Sandro
85ce10e75a
Merge pull request #164042 from mstarzyk/miller-6 2022-03-23 05:31:31 +01:00
github-actions[bot]
9d35f2cd19
Merge staging-next into staging 2022-03-22 18:10:54 +00:00
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
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
github-actions[bot]
e452d308f5
Merge staging-next into staging 2022-03-22 12:02:02 +00: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
github-actions[bot]
c62314becb
Merge staging-next into staging 2022-03-22 06:01:42 +00:00
Artturi
6134c2f891
Merge pull request #161034 from andr1an/fix/nixos-generate-config-absolute-root-path 2022-03-22 02:35:06 +02:00
github-actions[bot]
03c279d7ea
Merge staging-next into staging 2022-03-22 00:02:58 +00: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
Vladimír Čunát
6facca010b
Merge #164644: nixos/nix-daemon: workaround NixOS/nix#6285
...into staging
2022-03-21 19:53:28 +01: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
github-actions[bot]
6ae26bb3c8
Merge staging-next into staging 2022-03-21 18:07:51 +00: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
github-actions[bot]
de642acb2e
Merge staging-next into staging 2022-03-21 12:10:50 +00: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
Vladimír Čunát
a519740b4c
Merge branch 'staging-next' into staging 2022-03-21 11:57:43 +01:00
Florian Klink
0d198e7a52 nixos/nix-daemon: workaround NixOS/nix#6285
The Nix-provided `nix-daemon.socket` file has a

> ConditionPathIsReadWrite=/nix/var/nix/daemon-socket/socket

line, to skip that unit if /nix/var/nix/daemon-socket/socket is
read-only (which is the case in some nixos-containers with that folder
bind-ro-mounted from the host).

In these cases, the unit was skipped.

Systemd 250 (rightfully) started to also skip in these cases:

> [ 237.187747] systemd[1]: Nix Daemon Socket was skipped because of a failed condition check (ConditionPathIsReadWrite=/nix/var/nix/daemon-socket).

However, systemd < 250 didn't skip if /nix/var/nix/daemon-socket/socket
didn't /exist at all/, and we were relying on this bug in the case for
fresh NixOS systems, to have /nix/var/nix/daemon-socket/socket created
initially.

Move the creation of that folder to systemd-tmpfiles, by shipping an
appropriate file in `${nixPackage}/lib/tmpfiles.d/nix-daemon.conf`
(NixOS/nix#6285).

In the meantime, set a systemd tmpfiles rule manually in NixOS.

This has been tested to still work with read-only bind-mounted
/nix/var/nix/daemon-socket/socket in containers, it'll keep them
read-only ;-)
2022-03-21 11:43:38 +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
github-actions[bot]
3df8e35539
Merge staging-next into staging 2022-03-20 00:02:45 +00:00
Martin Weinelt
f4f3622cb1 Merge remote-tracking branch 'origin/staging-next' into staging 2022-03-20 00:00:32 +01:00