diff options
author | Robert Hensing <robert@roberthensing.nl> | 2023-11-08 23:42:19 +0100 |
---|---|---|
committer | Robert Hensing <robert@roberthensing.nl> | 2023-11-10 18:17:35 +0100 |
commit | c8b8ab81552ad9a12cb574f74daec6d1444b85e6 (patch) | |
tree | ca474191e0526f666059512b21a7de8c2ba959a1 /pkgs/tools/package-management/nix | |
parent | 558d433d960339002f4538fa61645cb954005a25 (diff) |
nix: Add fallback paths check to tests
Diffstat (limited to 'pkgs/tools/package-management/nix')
-rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 38 |
1 files changed, 37 insertions, 1 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 0b80cd531d43f..08318d6f488d5 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -7,6 +7,7 @@ , fetchurl , fetchpatch , fetchpatch2 +, runCommand , Security , storeDir ? "/nix/store" @@ -112,6 +113,41 @@ let hash = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0="; }; + # Intentionally does not support overrideAttrs etc + # Use only for tests that are about the package relation to `pkgs` and/or NixOS. + addTestsShallowly = tests: pkg: pkg // { + tests = pkg.tests // tests; + # In case someone reads the wrong attribute + passthru.tests = pkg.tests // tests; + }; + + addFallbackPathsCheck = pkg: addTestsShallowly + { nix-fallback-paths = + runCommand "test-nix-fallback-paths-version-equals-nix-stable" { + paths = lib.concatStringsSep "\n" (builtins.attrValues (import ../../../../nixos/modules/installer/tools/nix-fallback-paths.nix)); + } '' + # From nix test suite + grepQuietInverse() { + ! grep "$@" > /dev/null + } + if [[ "" != $(grep -v 'nix-${pkg.version}$' <<< "$paths") ]]; then + echo "nix-fallback-paths not up to date with nixVersions.stable (nix-${pkg.version})" + echo "The following paths are not up to date:" + grep -v 'nix-${pkg.version}$' <<< "$paths" + echo + echo "Fix it by running in nixpkgs:" + echo + echo "curl https://releases.nixos.org/nix/nix-${pkg.version}/fallback-paths.nix >nixos/modules/installer/tools/nix-fallback-paths.nix" + echo + exit 1 + else + echo "nix-fallback-paths versions up to date" + touch $out + fi + ''; + } + pkg; + in lib.makeExtensible (self: ({ nix_2_3 = (common rec { version = "2.3.16"; @@ -203,7 +239,7 @@ in lib.makeExtensible (self: ({ else nix; - stable = self.nix_2_18; + stable = addFallbackPathsCheck self.nix_2_18; unstable = self.nix_2_18; } // lib.optionalAttrs config.allowAliases { |