gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nix: add installer test and adapt passthru tests based on the platform

Browse Source
This commit is contained in:
Jörg Thalheim
2024-09-22 18:52:17 +02:00
parent e36ab64536
commit 30f11e43df
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/package-management/nix/common.nix
+10 -8
View File
@@ -263,14 +263,6 @@ self = stdenv.mkDerivation {
perl-bindings = perl.pkgs.toPerlModule (callPackage ./nix-perl.nix { nix = self; inherit Security; });
tests = {
nixi686 = pkgsi686Linux.nixVersions.${self_attribute_name};
nixStatic = pkgsStatic.nixVersions.${self_attribute_name};
# Basic smoke test that needs to pass when upgrading nix.
# Note that this test does only test the nixVersions.stable attribute.
misc = nixosTests.nix-misc.default;
upgrade = nixosTests.nix-upgrade;
srcVersion = runCommand "nix-src-version" {
inherit version;
} ''
@@ -291,6 +283,16 @@ self = stdenv.mkDerivation {
inherit lib pkgs;
nix = self;
};
} // lib.optionalAttrs stdenv.isLinux {
nixStatic = pkgsStatic.nixVersions.${self_attribute_name};
# Basic smoke tests that needs to pass when upgrading nix.
# Note that this test does only test the nixVersions.stable attribute.
misc = nixosTests.nix-misc.default;
upgrade = nixosTests.nix-upgrade;
simpleUefiSystemdBoot = nixosTests.installer.simpleUefiSystemdBoot;
} // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") {
nixi686 = pkgsi686Linux.nixVersions.${self_attribute_name};
};
};