Skip to content

Commit fa939cd

Browse files
ci/eval: allow configuration of the system to eval attrpaths on (#408047)
2 parents 139080c + 6b18b3d commit fa939cd

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

ci/eval/default.nix

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ let
3636
supportedSystems = builtins.fromJSON (builtins.readFile ../supportedSystems.json);
3737

3838
attrpathsSuperset =
39+
{
40+
evalSystem,
41+
}:
3942
runCommand "attrpaths-superset.json"
4043
{
4144
src = nixpkgs;
@@ -55,6 +58,7 @@ let
5558
-I "$src" \
5659
--option restrict-eval true \
5760
--option allow-import-from-derivation false \
61+
--option eval-system "${evalSystem}" \
5862
--arg enableWarnings false > $out/paths.json
5963
'';
6064

@@ -65,7 +69,7 @@ let
6569
# because `--argstr system` would only be passed to the ci/default.nix file!
6670
evalSystem,
6771
# The path to the `paths.json` file from `attrpathsSuperset`
68-
attrpathFile ? "${attrpathsSuperset}/paths.json",
72+
attrpathFile ? "${attrpathsSuperset { inherit evalSystem; }}/paths.json",
6973
# The number of attributes per chunk, see ./README.md for more info.
7074
chunkSize,
7175
checkMeta ? true,

0 commit comments

Comments
 (0)