treewide: pass system argument to eval-config.nix
Calling `eval-config.nix` without a `system` from a Nix flake fails with `error: attribute 'currentSystem' missing` since #230523. Setting `system = null` removes the use of `currentSystem` and instead uses the value from the `nixpkgs` module.
This commit is contained in:
@@ -515,6 +515,10 @@ in
|
|||||||
in [ extraConfig ] ++ (map (x: x.value) defs);
|
in [ extraConfig ] ++ (map (x: x.value) defs);
|
||||||
prefix = [ "containers" name ];
|
prefix = [ "containers" name ];
|
||||||
inherit (config) specialArgs;
|
inherit (config) specialArgs;
|
||||||
|
|
||||||
|
# The system is inherited from the host above.
|
||||||
|
# Set it to null, to remove the "legacy" entrypoint's non-hermetic default.
|
||||||
|
system = null;
|
||||||
}).config;
|
}).config;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -25,6 +25,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||||||
system.stateVersion = "18.03";
|
system.stateVersion = "18.03";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# The system is inherited from the host above.
|
||||||
|
# Set it to null, to remove the "legacy" entrypoint's non-hermetic default.
|
||||||
|
system = null;
|
||||||
};
|
};
|
||||||
in with pkgs; [
|
in with pkgs; [
|
||||||
stdenv stdenvNoCC emptyContainer.config.containers.foo.path
|
stdenv stdenvNoCC emptyContainer.config.containers.foo.path
|
||||||
|
|||||||
@@ -39009,6 +39009,10 @@ with pkgs;
|
|||||||
then configuration
|
then configuration
|
||||||
else [configuration]
|
else [configuration]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
# The system is inherited from the current pkgs above.
|
||||||
|
# Set it to null, to remove the "legacy" entrypoint's non-hermetic default.
|
||||||
|
system = null;
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
c.config.system.build // c;
|
c.config.system.build // c;
|
||||||
|
|||||||
Reference in New Issue
Block a user