From 523c701c0badbad5cadca2f847ef2f42846f4570 Mon Sep 17 00:00:00 2001 From: Vladimir Serov Date: Sat, 27 Nov 2021 01:23:32 +0300 Subject: [PATCH 1/2] stdenv: move overriden stdenv in closure Before that, base stdenv passed non-makeOverridable version of itself inside. This cause it to be lost on package-name.stdenv. --- pkgs/stdenv/generic/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index d7fb1b0ba063..49ebc67f854e 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -1,6 +1,6 @@ -let lib = import ../../../lib; in lib.makeOverridable ( +let lib = import ../../../lib; stdenv-overridable = lib.makeOverridable ( -{ name ? "stdenv", preHook ? "", initialPath +argsStdenv@{ name ? "stdenv", preHook ? "", initialPath , # If we don't have a C compiler, we might either have `cc = null` or `cc = # throw ...`, but if we do have a C compiler we should definiely have `cc != @@ -81,8 +81,10 @@ let defaultBuildInputs = extraBuildInputs; + stdenv = (stdenv-overridable argsStdenv); + # The stdenv that we are producing. - stdenv = + in derivation ( lib.optionalAttrs (allowedRequisites != null) { allowedRequisites = allowedRequisites @@ -172,6 +174,5 @@ let # "lift" packages like curl from the final stdenv for Linux to # all-packages.nix for that platform (meaning that it has a line # like curl = if stdenv ? curl then stdenv.curl else ...). - // extraAttrs; - -in stdenv) + // extraAttrs +); in stdenv-overridable From 706988fd4937048d30c52f3251965445e133fa76 Mon Sep 17 00:00:00 2001 From: Vladimir Serov Date: Sat, 27 Nov 2021 02:05:36 +0300 Subject: [PATCH 2/2] CODEOWNERS: added cab404 --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 7dc14a61cbae..8fba792f5ebc 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -32,7 +32,7 @@ /pkgs/top-level/stage.nix @nbp @Ericson2314 @matthewbauer /pkgs/top-level/splice.nix @Ericson2314 @matthewbauer /pkgs/top-level/release-cross.nix @Ericson2314 @matthewbauer -/pkgs/stdenv/generic @Ericson2314 @matthewbauer +/pkgs/stdenv/generic @Ericson2314 @matthewbauer @cab404 /pkgs/stdenv/cross @Ericson2314 @matthewbauer /pkgs/build-support/cc-wrapper @Ericson2314 @orivej /pkgs/build-support/bintools-wrapper @Ericson2314 @orivej