movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

switch-to-configuration-ng: fix clippy issues and run clippy in drv (#363912)

Browse source
This commit is contained in:
Ramses 2024-12-11 21:36:39 +01:00 • committed by GitHub
commit baaaa3f67d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 60 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

10
nixos/tests/all-tests.nix
View file

@ -965,8 +965,14 @@ in {
swapspace = handleTestOn ["aarch64-linux" "x86_64-linux"] ./swapspace.nix {};
sway = handleTest ./sway.nix {};
swayfx = handleTest ./swayfx.nix {};
switchTest = handleTest ./switch-test.nix { ng = false; };
switchTestNg = handleTest ./switch-test.nix { ng = true; };
switchTest = runTest {
imports = [ ./switch-test.nix ];
defaults.system.switch.enableNg = false;
};
switchTestNg = runTest {
imports = [ ./switch-test.nix ];
defaults.system.switch.enableNg = true;
};
sx = handleTest ./sx.nix {};
sympa = handleTest ./sympa.nix {};
syncthing = handleTest ./syncthing.nix {};

7
nixos/tests/switch-test.nix
View file

@ -1,6 +1,7 @@
# Test configuration switching.
{ lib, pkgs, ...}:
import ./make-test-python.nix ({ lib, pkgs, ng, ...} : let
let
# Simple service that can either be socket-activated or that will
# listen on port 1234 if not socket-activated.
@ -48,8 +49,6 @@ in {
nodes = {
machine = { pkgs, lib, ... }: {
system.switch.enableNg = ng;
environment.systemPackages = [ pkgs.socat ]; # for the socket activation stuff
users.mutableUsers = false;
@ -1455,4 +1454,4 @@ in {
assert_lacks(out, "\nstarting the following units:")
assert_lacks(out, "the following new units were started:")
'';
})
}