Skip to content

Commit f8b5a2f

Browse files
committed
ci/version-info: correctly set NIX_PATH instead of flake registries
Flake registries and include paths are not the same thing. `<nixpkgs>` looks for nixpkgs on the include path, set by `NIX_PATH` and `--include`. However `--inputs-from` adds inputs to the flake registry, not the include path. (cherry picked from commit 2369b7f)
1 parent 13cc4d8 commit f8b5a2f

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

update-scripts/version-info/default.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
lib,
3+
path,
34
callPackage,
45
writeShellApplication,
56
stdenv,
@@ -15,6 +16,7 @@ writeShellApplication {
1516
NIX_CONFIG = ''
1617
experimental-features = nix-command flakes pipe-operators
1718
'';
19+
NIX_PATH = "nixpkgs=${toString path}";
1820
};
1921

2022
text = ''
@@ -23,7 +25,6 @@ writeShellApplication {
2325
2426
# Use channels.nix to build channels.toml
2527
nix build --impure \
26-
--inputs-from ${toString ../..} \
2728
--file ${./supported-versions.nix} \
2829
--argstr system ${stdenv.hostPlatform.system} \
2930
--arg-from-file channelsJSON channels.json \

0 commit comments

Comments
 (0)