treewide: enable strictDeps in bootstrap packages

This commit is contained in:
Artturin 2022-05-21 19:58:22 +03:00
parent 39b85d1c2a
commit f002ffed9a
33 changed files with 36 additions and 3 deletions

View file

@ -3,6 +3,7 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "expand-response-params"; name = "expand-response-params";
src = ./expand-response-params.c; src = ./expand-response-params.c;
strictDeps = true;
# Work around "stdenv-darwin-boot-2 is not allowed to refer to path # Work around "stdenv-darwin-boot-2 is not allowed to refer to path
# /nix/store/...-expand-response-params.c" # /nix/store/...-expand-response-params.c"
unpackPhase = '' unpackPhase = ''

View file

@ -14,6 +14,7 @@ let
mirrorsFile = mirrorsFile =
buildPackages.stdenvNoCC.mkDerivation ({ buildPackages.stdenvNoCC.mkDerivation ({
name = "mirrors-list"; name = "mirrors-list";
strictDeps = true;
builder = ./write-mirror-list.sh; builder = ./write-mirror-list.sh;
preferLocalBuild = true; preferLocalBuild = true;
} // mirrors); } // mirrors);

View file

@ -14,6 +14,7 @@ in
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
name = "nuke-references"; name = "nuke-references";
strictDeps = true;
dontUnpack = true; dontUnpack = true;
dontConfigure = true; dontConfigure = true;
dontBuild = true; dontBuild = true;

View file

@ -44,6 +44,7 @@ stdenv.mkDerivation {
inherit pkg-config; inherit pkg-config;
}; };
strictDeps = true;
dontBuild = true; dontBuild = true;
dontConfigure = true; dontConfigure = true;
@ -80,8 +81,6 @@ stdenv.mkDerivation {
ln -s ${pkg-config}/share $out/share ln -s ${pkg-config}/share $out/share
''; '';
strictDeps = true;
wrapperName = "PKG_CONFIG_WRAPPER"; wrapperName = "PKG_CONFIG_WRAPPER";
setupHooks = [ setupHooks = [

View file

@ -528,6 +528,7 @@ rec {
runCommand name runCommand name
(substitutions // { (substitutions // {
inherit meta; inherit meta;
strictDeps = true;
}) })
('' (''
mkdir -p $out/nix-support mkdir -p $out/nix-support

View file

@ -27,6 +27,7 @@ let
inherit sha256; inherit sha256;
}; };
strictDeps = true;
# TODO: Add a "dev" output containing the header files. # TODO: Add a "dev" output containing the header files.
outputs = [ "out" "man" "devdoc" ] ++ outputs = [ "out" "man" "devdoc" ] ++
optional crossCompiling "mini"; optional crossCompiling "mini";

View file

@ -5,6 +5,7 @@ sitePackages:
let let
hook = ./setup-hook.sh; hook = ./setup-hook.sh;
in runCommand "python-setup-hook.sh" { in runCommand "python-setup-hook.sh" {
strictDeps = true;
inherit sitePackages; inherit sitePackages;
} '' } ''
cp ${hook} hook.sh cp ${hook} hook.sh

View file

@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-95uPkEt0nj4NIK/q3s+CScVbLjLU67CJrjeN9HncryU="; sha256 = "sha256-95uPkEt0nj4NIK/q3s+CScVbLjLU67CJrjeN9HncryU=";
}; };
strictDeps = true;
outputs = [ "out" "dev" ]; # TODO: fix referrers outputs = [ "out" "dev" ]; # TODO: fix referrers
outputBin = "dev"; outputBin = "dev";

View file

@ -28,6 +28,7 @@ let self = stdenv.mkDerivation rec {
outputs = [ "out" "dev" "info" ]; outputs = [ "out" "dev" "info" ];
passthru.static = self.out; passthru.static = self.out;
strictDeps = true;
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ m4 ]; nativeBuildInputs = [ m4 ];

View file

@ -18,6 +18,7 @@ stdenv.mkDerivation {
inherit patches; inherit patches;
strictDeps = true;
buildInputs = [ gmp ]; buildInputs = [ gmp ];
inherit configureFlags; inherit configureFlags;

View file

@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
# on Darwin, so disable NLS for now. # on Darwin, so disable NLS for now.
++ lib.optional stdenv.hostPlatform.isDarwin "--disable-nls"; ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-nls";
strictDeps = true;
nativeBuildInputs = nativeBuildInputs =
if stdenv.hostPlatform.isNetBSD then [ netbsd.gencat ] else [ gettext ] if stdenv.hostPlatform.isNetBSD then [ netbsd.gencat ] else [ gettext ]
# Need to regenerate configure script with newer version in order to pass # Need to regenerate configure script with newer version in order to pass

View file

@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
patches = []; patches = [];
strictDeps = true;
outputs = [ "out" "dev" "man" "info" ]; outputs = [ "out" "dev" "man" "info" ];
configureFlags = [ configureFlags = [

View file

@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-dpQM1Od46Ak1eanRlbJf/16Tbp3GJCBoUotDenZ2T5E="; sha256 = "sha256-dpQM1Od46Ak1eanRlbJf/16Tbp3GJCBoUotDenZ2T5E=";
}; };
strictDeps = true;
outputs = [ "bin" "dev" "out" "info" "devdoc" ]; outputs = [ "bin" "dev" "out" "info" "devdoc" ];
patches = optional stdenv.isDarwin ./fix-error-darwin.patch; patches = optional stdenv.isDarwin ./fix-error-darwin.patch;

View file

@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
sha256 = "0n846hqfqvmsmim7qdlms0qr86f1hck19p12nq3g3z2x74n3sl0p"; sha256 = "0n846hqfqvmsmim7qdlms0qr86f1hck19p12nq3g3z2x74n3sl0p";
}; };
strictDeps = true;
buildInputs = [ gmp mpfr ]; buildInputs = [ gmp mpfr ];
doCheck = true; # not cross; doCheck = true; # not cross;

View file

@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "info" "doc" ]; outputs = [ "out" "dev" "info" "doc" ];
strictDeps = true;
propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv;
configureFlags = [ configureFlags = [

View file

@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "doc" "info" ]; outputs = [ "out" "dev" "doc" "info" ];
strictDeps = true;
# mpfr.h requires gmp.h # mpfr.h requires gmp.h
propagatedBuildInputs = [ gmp ]; propagatedBuildInputs = [ gmp ];

View file

@ -44,6 +44,7 @@ stdenv.mkDerivation (rec {
./fix-configure-issue-cross.patch ./fix-configure-issue-cross.patch
]; ];
strictDeps = true;
outputs = [ "out" "dev" ] outputs = [ "out" "dev" ]
++ lib.optional splitStaticOutput "static"; ++ lib.optional splitStaticOutput "static";
setOutputFlags = false; setOutputFlags = false;

View file

@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-6KbrnSjdy6j/7z+iEWUyOem/I5q6agGmt8/Hzq7GnL0="; sha256 = "sha256-6KbrnSjdy6j/7z+iEWUyOem/I5q6agGmt8/Hzq7GnL0=";
}; };
strictDeps = true;
buildInputs = [ xz ]; buildInputs = [ xz ];
meta = with lib; { meta = with lib; {

View file

@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
./2.71-fix-race.patch ./2.71-fix-race.patch
]; ];
strictDeps = true;
nativeBuildInputs = [ m4 perl texinfo ]; nativeBuildInputs = [ m4 perl texinfo ];
buildInputs = [ m4 ]; buildInputs = [ m4 ];
postBuild = " postBuild = "

View file

@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0sdl32qxdy7m06iggmkkvf7j520rmmgbsjzbm7fgnxwxdp6mh7gh"; sha256 = "0sdl32qxdy7m06iggmkkvf7j520rmmgbsjzbm7fgnxwxdp6mh7gh";
}; };
strictDeps = true;
nativeBuildInputs = [ autoconf perl ]; nativeBuildInputs = [ autoconf perl ];
buildInputs = [ autoconf ]; buildInputs = [ autoconf ];

View file

@ -109,6 +109,7 @@ stdenv.mkDerivation {
outputs = [ "out" "info" "man" ]; outputs = [ "out" "info" "man" ];
strictDeps = true;
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ nativeBuildInputs = [
bison bison

View file

@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-swapHA/ZO8QoDPwumMt6s5gf91oYe+oyk4EfRSyJqMg="; sha256 = "sha256-swapHA/ZO8QoDPwumMt6s5gf91oYe+oyk4EfRSyJqMg=";
}; };
strictDeps = true;
doCheck = false; doCheck = false;
configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ] configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ]

View file

@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
substituteInPlace build-aux/ltmain.in --replace '#! /usr/bin/env sh' '#!${runtimeShell}' substituteInPlace build-aux/ltmain.in --replace '#! /usr/bin/env sh' '#!${runtimeShell}'
''; '';
strictDeps = true;
nativeBuildInputs = [ autoconf automake help2man m4 perl ]; nativeBuildInputs = [ autoconf automake help2man m4 perl ];
propagatedBuildInputs = [ m4 file ]; propagatedBuildInputs = [ m4 file ];

View file

@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-uaRvKYkyLrifpPYjfiCDbFe0VapDoyVF6gk7Qx2YL1w="; sha256 = "sha256-uaRvKYkyLrifpPYjfiCDbFe0VapDoyVF6gk7Qx2YL1w=";
}; };
strictDeps = true;
setupHook = [ ./setup-hook.sh ]; setupHook = [ ./setup-hook.sh ];
# fails 8 out of 24 tests, problems when loading libc.so.6 # fails 8 out of 24 tests, problems when loading libc.so.6

View file

@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
}; };
outputs = [ "out" "man" "doc" ]; outputs = [ "out" "man" "doc" ];
strictDeps = true;
# Process Requires.private properly, see # Process Requires.private properly, see
# http://bugs.freedesktop.org/show_bug.cgi?id=4738, migrated to # http://bugs.freedesktop.org/show_bug.cgi?id=4738, migrated to

View file

@ -14,6 +14,7 @@ let
ARCH = stdenvNoCC.hostPlatform.linuxArch; ARCH = stdenvNoCC.hostPlatform.linuxArch;
strictDeps = true;
# It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc. # It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc.
# We do this so we have a build->build, not build->host, C compiler. # We do this so we have a build->build, not build->host, C compiler.
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];

View file

@ -162,6 +162,7 @@ in
# stage1. # stage1.
${localSystem.libc} = self.stdenv.mkDerivation { ${localSystem.libc} = self.stdenv.mkDerivation {
pname = "bootstrap-stage0-${localSystem.libc}"; pname = "bootstrap-stage0-${localSystem.libc}";
strictDeps = true;
version = "bootstrap"; version = "bootstrap";
buildCommand = '' buildCommand = ''
mkdir -p $out mkdir -p $out
@ -269,6 +270,7 @@ in
inherit (prevStage.bintools.bintools) name; inherit (prevStage.bintools.bintools) name;
dontUnpack = true; dontUnpack = true;
dontBuild = true; dontBuild = true;
strictDeps = true;
# We wouldn't need to *copy* all, but it's easier and the result is temporary anyway. # We wouldn't need to *copy* all, but it's easier and the result is temporary anyway.
installPhase = '' installPhase = ''
mkdir -p "$out"/bin mkdir -p "$out"/bin

View file

@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-FnhwNy4OHe8d5M6iYCClkxzcB/EHXg0veXwv43ZlxbA="; sha256 = "sha256-FnhwNy4OHe8d5M6iYCClkxzcB/EHXg0veXwv43ZlxbA=";
}; };
strictDeps = true;
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
patches = [ patches = [

View file

@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
sha256 = "1ps2i8i212n0f4xpq6clp7h13q7m1y8slqvxha9i8d0bj0qgj5si"; sha256 = "1ps2i8i212n0f4xpq6clp7h13q7m1y8slqvxha9i8d0bj0qgj5si";
}; };
strictDeps = true;
outputs = [ "bin" "dev" "out" "man" "doc" ]; outputs = [ "bin" "dev" "out" "man" "doc" ];
configureFlags = lib.optional enableStatic "--disable-shared"; configureFlags = lib.optional enableStatic "--disable-shared";

View file

@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-E+Uyx7Nk99V+I9/uoxRxAxUMuQWTpXr4bBDk9uQRYD8="; sha256 = "sha256-E+Uyx7Nk99V+I9/uoxRxAxUMuQWTpXr4bBDk9uQRYD8=";
}; };
strictDeps = true;
nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file;
buildInputs = [ zlib ] buildInputs = [ zlib ]
++ lib.optional stdenv.hostPlatform.isWindows libgnurx; ++ lib.optional stdenv.hostPlatform.isWindows libgnurx;

View file

@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1bgafvy3ypbhhfznwjv1lxmd6mci3x1byilnnkc7gcr486wlb8pl"; sha256 = "1bgafvy3ypbhhfznwjv1lxmd6mci3x1byilnnkc7gcr486wlb8pl";
}; };
strictDeps = true;
meta = with lib; { meta = with lib; {
homepage = "https://www.gnu.org/software/which/"; homepage = "https://www.gnu.org/software/which/";
description = "Shows the full path of (shell) commands"; description = "Shows the full path of (shell) commands";

View file

@ -18833,7 +18833,7 @@ with pkgs;
glibcIconv = libc: let glibcIconv = libc: let
inherit (libc) pname version; inherit (libc) pname version;
libcDev = lib.getDev libc; libcDev = lib.getDev libc;
in runCommand "${pname}-iconv-${version}" {} '' in runCommand "${pname}-iconv-${version}" { strictDeps = true; } ''
mkdir -p $out/include mkdir -p $out/include
ln -sv ${libcDev}/include/iconv.h $out/include ln -sv ${libcDev}/include/iconv.h $out/include
''; '';

View file

@ -12373,6 +12373,7 @@ let
LocaleGettext = buildPerlPackage { LocaleGettext = buildPerlPackage {
pname = "gettext"; pname = "gettext";
version = "1.07"; version = "1.07";
strictDeps = true;
buildInputs = [ pkgs.gettext ]; buildInputs = [ pkgs.gettext ];
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.07.tar.gz"; url = "mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.07.tar.gz";