Unverified Commit 3007746b authored May 14, 2023 by Jörg Thalheim Committed by GitHub May 14, 2023

Merge pull request #231473 from B4dM4n/eval-config-pass-system

treewide: pass system argument to eval-config.nix

parents b5a6d5bf c51fe112

nixos/modules/virtualisation/nixos-containers.nix

+4 −0

Original line number	Diff line number	Diff line
		@@ -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;
		};
		};

nixos/tests/containers-imperative.nix

+4 −0

Original line number	Diff line number	Diff line
		@@ -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

pkgs/top-level/all-packages.nix

+4 −0

Original line number	Diff line number	Diff line
		@@ -39030,6 +39030,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;