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:
Fabian Möller 2023-05-12 14:56:23 +02:00
parent 24833dd608
commit c51fe112cc
No known key found for this signature in database
GPG Key ID: 70B29D65DD8A7E31
3 changed files with 12 additions and 0 deletions

View File

@ -515,6 +515,10 @@ in
in [ extraConfig ] ++ (map (x: x.value) defs);
prefix = [ "containers" name ];
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;
};
};

View File

@ -25,6 +25,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
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; [
stdenv stdenvNoCC emptyContainer.config.containers.foo.path

View File

@ -39009,6 +39009,10 @@ with pkgs;
then 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
c.config.system.build // c;