tests.*: extend the existing `config` (#492152) (01f3f2ea) · Commits · nix / nixpkgs

pkgs/build-support/fetchgit/tests.nix

+7 −2

Original line number	Diff line number	Diff line
		{
		stdenv,
		config,
		runCommand,
		testers,
		fetchgit,
		@@ -239,10 +241,13 @@
		withGitConfig =
		let
		pkgs = import ../../.. {
		config.gitConfig = {
		system = stdenv.hostPlatform.system;
		config = config // {
		gitConfig = {
		url."https://github.com".insteadOf = "https://doesntexist.forsure";
		};
		};
		};
		in
		pkgs.testers.invalidateFetcherByDrvHash pkgs.fetchgit {
		name = "fetchgit-with-config";

+2 −1

Original line number	Diff line number	Diff line
		{
		lib,
		config,
		pkgs,
		...
		}:
		@@ -17,7 +18,7 @@ lib.recurseIntoAttrs {
		let
		pkgs' = import ../.. {
		system = pkgs.stdenv.hostPlatform.system;
		config = {
		config = config // {
		permittedInsecurePackages = builtins.seq pkgs'.glibc.version [ ];
		};
		};

+6 −1

Original line number	Diff line number	Diff line
		{ pkgs, lib }:
		{
		pkgs,
		config,
		lib,
		}:

		let

		@@ -78,6 +82,7 @@ let
		crossPkgs = import pkgs.path {
		localSystem = { inherit (pkgs.stdenv.hostPlatform) config; };
		crossSystem = crossSystemFun system;
		inherit config;
		};

		emulator = crossPkgs.stdenv.hostPlatform.emulator pkgs;

+2 −1

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@
		stdenv,
		pkgs,
		lib,
		config,
		testers,
		}:

		@@ -20,7 +21,7 @@ let
		# use a early stdenv so when hacking on stdenv this test can be run quickly
		bootStdenv = earlyPkgs.stdenv.__bootPackages.stdenv.__bootPackages.stdenv or earlyPkgs.stdenv;
		pkgsStructured = import pkgs.path {
		config = {
		config = config // {
		structuredAttrsByDefault = true;
		};
		inherit (stdenv.hostPlatform) system;