lol

treewide: enable strictDeps in bootstrap packages

Artturin f002ffed 39b85d1c

+36 -3
+1
pkgs/build-support/expand-response-params/default.nix
··· 3 stdenv.mkDerivation { 4 name = "expand-response-params"; 5 src = ./expand-response-params.c; 6 # Work around "stdenv-darwin-boot-2 is not allowed to refer to path 7 # /nix/store/...-expand-response-params.c" 8 unpackPhase = ''
··· 3 stdenv.mkDerivation { 4 name = "expand-response-params"; 5 src = ./expand-response-params.c; 6 + strictDeps = true; 7 # Work around "stdenv-darwin-boot-2 is not allowed to refer to path 8 # /nix/store/...-expand-response-params.c" 9 unpackPhase = ''
+1
pkgs/build-support/fetchurl/default.nix
··· 14 mirrorsFile = 15 buildPackages.stdenvNoCC.mkDerivation ({ 16 name = "mirrors-list"; 17 builder = ./write-mirror-list.sh; 18 preferLocalBuild = true; 19 } // mirrors);
··· 14 mirrorsFile = 15 buildPackages.stdenvNoCC.mkDerivation ({ 16 name = "mirrors-list"; 17 + strictDeps = true; 18 builder = ./write-mirror-list.sh; 19 preferLocalBuild = true; 20 } // mirrors);
+1
pkgs/build-support/nuke-references/default.nix
··· 14 stdenvNoCC.mkDerivation { 15 name = "nuke-references"; 16 17 dontUnpack = true; 18 dontConfigure = true; 19 dontBuild = true;
··· 14 stdenvNoCC.mkDerivation { 15 name = "nuke-references"; 16 17 + strictDeps = true; 18 dontUnpack = true; 19 dontConfigure = true; 20 dontBuild = true;
+1 -2
pkgs/build-support/pkg-config-wrapper/default.nix
··· 44 inherit pkg-config; 45 }; 46 47 dontBuild = true; 48 dontConfigure = true; 49 ··· 79 + '' 80 ln -s ${pkg-config}/share $out/share 81 ''; 82 - 83 - strictDeps = true; 84 85 wrapperName = "PKG_CONFIG_WRAPPER"; 86
··· 44 inherit pkg-config; 45 }; 46 47 + strictDeps = true; 48 dontBuild = true; 49 dontConfigure = true; 50 ··· 80 + '' 81 ln -s ${pkg-config}/share $out/share 82 ''; 83 84 wrapperName = "PKG_CONFIG_WRAPPER"; 85
+1
pkgs/build-support/trivial-builders.nix
··· 528 runCommand name 529 (substitutions // { 530 inherit meta; 531 }) 532 ('' 533 mkdir -p $out/nix-support
··· 528 runCommand name 529 (substitutions // { 530 inherit meta; 531 + strictDeps = true; 532 }) 533 ('' 534 mkdir -p $out/nix-support
+1
pkgs/development/interpreters/perl/default.nix
··· 27 inherit sha256; 28 }; 29 30 # TODO: Add a "dev" output containing the header files. 31 outputs = [ "out" "man" "devdoc" ] ++ 32 optional crossCompiling "mini";
··· 27 inherit sha256; 28 }; 29 30 + strictDeps = true; 31 # TODO: Add a "dev" output containing the header files. 32 outputs = [ "out" "man" "devdoc" ] ++ 33 optional crossCompiling "mini";
+1
pkgs/development/interpreters/python/setup-hook.nix
··· 5 let 6 hook = ./setup-hook.sh; 7 in runCommand "python-setup-hook.sh" { 8 inherit sitePackages; 9 } '' 10 cp ${hook} hook.sh
··· 5 let 6 hook = ./setup-hook.sh; 7 in runCommand "python-setup-hook.sh" { 8 + strictDeps = true; 9 inherit sitePackages; 10 } '' 11 cp ${hook} hook.sh
+2
pkgs/development/libraries/expat/default.nix
··· 23 sha256 = "sha256-95uPkEt0nj4NIK/q3s+CScVbLjLU67CJrjeN9HncryU="; 24 }; 25 26 outputs = [ "out" "dev" ]; # TODO: fix referrers 27 outputBin = "dev"; 28
··· 23 sha256 = "sha256-95uPkEt0nj4NIK/q3s+CScVbLjLU67CJrjeN9HncryU="; 24 }; 25 26 + strictDeps = true; 27 + 28 outputs = [ "out" "dev" ]; # TODO: fix referrers 29 outputBin = "dev"; 30
+1
pkgs/development/libraries/gmp/6.x.nix
··· 28 outputs = [ "out" "dev" "info" ]; 29 passthru.static = self.out; 30 31 depsBuildBuild = [ buildPackages.stdenv.cc ]; 32 nativeBuildInputs = [ m4 ]; 33
··· 28 outputs = [ "out" "dev" "info" ]; 29 passthru.static = self.out; 30 31 + strictDeps = true; 32 depsBuildBuild = [ buildPackages.stdenv.cc ]; 33 nativeBuildInputs = [ m4 ]; 34
+1
pkgs/development/libraries/isl/generic.nix
··· 18 19 inherit patches; 20 21 buildInputs = [ gmp ]; 22 23 inherit configureFlags;
··· 18 19 inherit patches; 20 21 + strictDeps = true; 22 buildInputs = [ gmp ]; 23 24 inherit configureFlags;
+1
pkgs/development/libraries/libelf/default.nix
··· 33 # on Darwin, so disable NLS for now. 34 ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-nls"; 35 36 nativeBuildInputs = 37 if stdenv.hostPlatform.isNetBSD then [ netbsd.gencat ] else [ gettext ] 38 # Need to regenerate configure script with newer version in order to pass
··· 33 # on Darwin, so disable NLS for now. 34 ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-nls"; 35 36 + strictDeps = true; 37 nativeBuildInputs = 38 if stdenv.hostPlatform.isNetBSD then [ netbsd.gencat ] else [ gettext ] 39 # Need to regenerate configure script with newer version in order to pass
+1
pkgs/development/libraries/libffi/default.nix
··· 21 22 patches = []; 23 24 outputs = [ "out" "dev" "man" "info" ]; 25 26 configureFlags = [
··· 21 22 patches = []; 23 24 + strictDeps = true; 25 outputs = [ "out" "dev" "man" "info" ]; 26 27 configureFlags = [
+1
pkgs/development/libraries/libidn2/default.nix
··· 16 sha256 = "sha256-dpQM1Od46Ak1eanRlbJf/16Tbp3GJCBoUotDenZ2T5E="; 17 }; 18 19 outputs = [ "bin" "dev" "out" "info" "devdoc" ]; 20 21 patches = optional stdenv.isDarwin ./fix-error-darwin.patch;
··· 16 sha256 = "sha256-dpQM1Od46Ak1eanRlbJf/16Tbp3GJCBoUotDenZ2T5E="; 17 }; 18 19 + strictDeps = true; 20 outputs = [ "bin" "dev" "out" "info" "devdoc" ]; 21 22 patches = optional stdenv.isDarwin ./fix-error-darwin.patch;
+1
pkgs/development/libraries/libmpc/default.nix
··· 16 sha256 = "0n846hqfqvmsmim7qdlms0qr86f1hck19p12nq3g3z2x74n3sl0p"; 17 }; 18 19 buildInputs = [ gmp mpfr ]; 20 21 doCheck = true; # not cross;
··· 16 sha256 = "0n846hqfqvmsmim7qdlms0qr86f1hck19p12nq3g3z2x74n3sl0p"; 17 }; 18 19 + strictDeps = true; 20 buildInputs = [ gmp mpfr ]; 21 22 doCheck = true; # not cross;
+1
pkgs/development/libraries/libunistring/default.nix
··· 16 17 outputs = [ "out" "dev" "info" "doc" ]; 18 19 propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; 20 21 configureFlags = [
··· 16 17 outputs = [ "out" "dev" "info" "doc" ]; 18 19 + strictDeps = true; 20 propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; 21 22 configureFlags = [
+1
pkgs/development/libraries/mpfr/default.nix
··· 19 20 outputs = [ "out" "dev" "doc" "info" ]; 21 22 # mpfr.h requires gmp.h 23 propagatedBuildInputs = [ gmp ]; 24
··· 19 20 outputs = [ "out" "dev" "doc" "info" ]; 21 22 + strictDeps = true; 23 # mpfr.h requires gmp.h 24 propagatedBuildInputs = [ gmp ]; 25
+1
pkgs/development/libraries/zlib/default.nix
··· 44 ./fix-configure-issue-cross.patch 45 ]; 46 47 outputs = [ "out" "dev" ] 48 ++ lib.optional splitStaticOutput "static"; 49 setOutputFlags = false;
··· 44 ./fix-configure-issue-cross.patch 45 ]; 46 47 + strictDeps = true; 48 outputs = [ "out" "dev" ] 49 ++ lib.optional splitStaticOutput "static"; 50 setOutputFlags = false;
+1
pkgs/development/tools/misc/autoconf-archive/default.nix
··· 9 sha256 = "sha256-6KbrnSjdy6j/7z+iEWUyOem/I5q6agGmt8/Hzq7GnL0="; 10 }; 11 12 buildInputs = [ xz ]; 13 14 meta = with lib; {
··· 9 sha256 = "sha256-6KbrnSjdy6j/7z+iEWUyOem/I5q6agGmt8/Hzq7GnL0="; 10 }; 11 12 + strictDeps = true; 13 buildInputs = [ xz ]; 14 15 meta = with lib; {
+1
pkgs/development/tools/misc/autoconf/default.nix
··· 20 ./2.71-fix-race.patch 21 ]; 22 23 nativeBuildInputs = [ m4 perl texinfo ]; 24 buildInputs = [ m4 ]; 25 postBuild = "
··· 20 ./2.71-fix-race.patch 21 ]; 22 23 + strictDeps = true; 24 nativeBuildInputs = [ m4 perl texinfo ]; 25 buildInputs = [ m4 ]; 26 postBuild = "
+1
pkgs/development/tools/misc/automake/automake-1.16.x.nix
··· 9 sha256 = "0sdl32qxdy7m06iggmkkvf7j520rmmgbsjzbm7fgnxwxdp6mh7gh"; 10 }; 11 12 nativeBuildInputs = [ autoconf perl ]; 13 buildInputs = [ autoconf ]; 14
··· 9 sha256 = "0sdl32qxdy7m06iggmkkvf7j520rmmgbsjzbm7fgnxwxdp6mh7gh"; 10 }; 11 12 + strictDeps = true; 13 nativeBuildInputs = [ autoconf perl ]; 14 buildInputs = [ autoconf ]; 15
+1
pkgs/development/tools/misc/binutils/default.nix
··· 109 110 outputs = [ "out" "info" "man" ]; 111 112 depsBuildBuild = [ buildPackages.stdenv.cc ]; 113 nativeBuildInputs = [ 114 bison
··· 109 110 outputs = [ "out" "info" "man" ]; 111 112 + strictDeps = true; 113 depsBuildBuild = [ buildPackages.stdenv.cc ]; 114 nativeBuildInputs = [ 115 bison
+1
pkgs/development/tools/misc/gnum4/default.nix
··· 14 sha256 = "sha256-swapHA/ZO8QoDPwumMt6s5gf91oYe+oyk4EfRSyJqMg="; 15 }; 16 17 doCheck = false; 18 19 configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ]
··· 14 sha256 = "sha256-swapHA/ZO8QoDPwumMt6s5gf91oYe+oyk4EfRSyJqMg="; 15 }; 16 17 + strictDeps = true; 18 doCheck = false; 19 20 configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ]
+1
pkgs/development/tools/misc/libtool/libtool2.nix
··· 44 substituteInPlace build-aux/ltmain.in --replace '#! /usr/bin/env sh' '#!${runtimeShell}' 45 ''; 46 47 nativeBuildInputs = [ autoconf automake help2man m4 perl ]; 48 propagatedBuildInputs = [ m4 file ]; 49
··· 44 substituteInPlace build-aux/ltmain.in --replace '#! /usr/bin/env sh' '#!${runtimeShell}' 45 ''; 46 47 + strictDeps = true; 48 nativeBuildInputs = [ autoconf automake help2man m4 perl ]; 49 propagatedBuildInputs = [ m4 file ]; 50
+1
pkgs/development/tools/misc/patchelf/default.nix
··· 14 sha256 = "sha256-uaRvKYkyLrifpPYjfiCDbFe0VapDoyVF6gk7Qx2YL1w="; 15 }; 16 17 setupHook = [ ./setup-hook.sh ]; 18 19 # fails 8 out of 24 tests, problems when loading libc.so.6
··· 14 sha256 = "sha256-uaRvKYkyLrifpPYjfiCDbFe0VapDoyVF6gk7Qx2YL1w="; 15 }; 16 17 + strictDeps = true; 18 setupHook = [ ./setup-hook.sh ]; 19 20 # fails 8 out of 24 tests, problems when loading libc.so.6
+1
pkgs/development/tools/misc/pkg-config/default.nix
··· 12 }; 13 14 outputs = [ "out" "man" "doc" ]; 15 16 # Process Requires.private properly, see 17 # http://bugs.freedesktop.org/show_bug.cgi?id=4738, migrated to
··· 12 }; 13 14 outputs = [ "out" "man" "doc" ]; 15 + strictDeps = true; 16 17 # Process Requires.private properly, see 18 # http://bugs.freedesktop.org/show_bug.cgi?id=4738, migrated to
+1
pkgs/os-specific/linux/kernel-headers/default.nix
··· 14 15 ARCH = stdenvNoCC.hostPlatform.linuxArch; 16 17 # It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc. 18 # We do this so we have a build->build, not build->host, C compiler. 19 depsBuildBuild = [ buildPackages.stdenv.cc ];
··· 14 15 ARCH = stdenvNoCC.hostPlatform.linuxArch; 16 17 + strictDeps = true; 18 # It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc. 19 # We do this so we have a build->build, not build->host, C compiler. 20 depsBuildBuild = [ buildPackages.stdenv.cc ];
+2
pkgs/stdenv/linux/default.nix
··· 162 # stage1. 163 ${localSystem.libc} = self.stdenv.mkDerivation { 164 pname = "bootstrap-stage0-${localSystem.libc}"; 165 version = "bootstrap"; 166 buildCommand = '' 167 mkdir -p $out ··· 269 inherit (prevStage.bintools.bintools) name; 270 dontUnpack = true; 271 dontBuild = true; 272 # We wouldn't need to *copy* all, but it's easier and the result is temporary anyway. 273 installPhase = '' 274 mkdir -p "$out"/bin
··· 162 # stage1. 163 ${localSystem.libc} = self.stdenv.mkDerivation { 164 pname = "bootstrap-stage0-${localSystem.libc}"; 165 + strictDeps = true; 166 version = "bootstrap"; 167 buildCommand = '' 168 mkdir -p $out ··· 270 inherit (prevStage.bintools.bintools) name; 271 dontUnpack = true; 272 dontBuild = true; 273 + strictDeps = true; 274 # We wouldn't need to *copy* all, but it's easier and the result is temporary anyway. 275 installPhase = '' 276 mkdir -p "$out"/bin
+1
pkgs/tools/compression/bzip2/default.nix
··· 26 sha256 = "sha256-FnhwNy4OHe8d5M6iYCClkxzcB/EHXg0veXwv43ZlxbA="; 27 }; 28 29 nativeBuildInputs = [ autoreconfHook ]; 30 31 patches = [
··· 26 sha256 = "sha256-FnhwNy4OHe8d5M6iYCClkxzcB/EHXg0veXwv43ZlxbA="; 27 }; 28 29 + strictDeps = true; 30 nativeBuildInputs = [ autoreconfHook ]; 31 32 patches = [
+1
pkgs/tools/compression/xz/default.nix
··· 16 sha256 = "1ps2i8i212n0f4xpq6clp7h13q7m1y8slqvxha9i8d0bj0qgj5si"; 17 }; 18 19 outputs = [ "bin" "dev" "out" "man" "doc" ]; 20 21 configureFlags = lib.optional enableStatic "--disable-shared";
··· 16 sha256 = "1ps2i8i212n0f4xpq6clp7h13q7m1y8slqvxha9i8d0bj0qgj5si"; 17 }; 18 19 + strictDeps = true; 20 outputs = [ "bin" "dev" "out" "man" "doc" ]; 21 22 configureFlags = lib.optional enableStatic "--disable-shared";
+1
pkgs/tools/misc/file/default.nix
··· 12 sha256 = "sha256-E+Uyx7Nk99V+I9/uoxRxAxUMuQWTpXr4bBDk9uQRYD8="; 13 }; 14 15 nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; 16 buildInputs = [ zlib ] 17 ++ lib.optional stdenv.hostPlatform.isWindows libgnurx;
··· 12 sha256 = "sha256-E+Uyx7Nk99V+I9/uoxRxAxUMuQWTpXr4bBDk9uQRYD8="; 13 }; 14 15 + strictDeps = true; 16 nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; 17 buildInputs = [ zlib ] 18 ++ lib.optional stdenv.hostPlatform.isWindows libgnurx;
+2
pkgs/tools/system/which/default.nix
··· 9 sha256 = "1bgafvy3ypbhhfznwjv1lxmd6mci3x1byilnnkc7gcr486wlb8pl"; 10 }; 11 12 meta = with lib; { 13 homepage = "https://www.gnu.org/software/which/"; 14 description = "Shows the full path of (shell) commands";
··· 9 sha256 = "1bgafvy3ypbhhfznwjv1lxmd6mci3x1byilnnkc7gcr486wlb8pl"; 10 }; 11 12 + strictDeps = true; 13 + 14 meta = with lib; { 15 homepage = "https://www.gnu.org/software/which/"; 16 description = "Shows the full path of (shell) commands";
+1 -1
pkgs/top-level/all-packages.nix
··· 18833 glibcIconv = libc: let 18834 inherit (libc) pname version; 18835 libcDev = lib.getDev libc; 18836 - in runCommand "${pname}-iconv-${version}" {} '' 18837 mkdir -p $out/include 18838 ln -sv ${libcDev}/include/iconv.h $out/include 18839 '';
··· 18833 glibcIconv = libc: let 18834 inherit (libc) pname version; 18835 libcDev = lib.getDev libc; 18836 + in runCommand "${pname}-iconv-${version}" { strictDeps = true; } '' 18837 mkdir -p $out/include 18838 ln -sv ${libcDev}/include/iconv.h $out/include 18839 '';
+1
pkgs/top-level/perl-packages.nix
··· 12373 LocaleGettext = buildPerlPackage { 12374 pname = "gettext"; 12375 version = "1.07"; 12376 buildInputs = [ pkgs.gettext ]; 12377 src = fetchurl { 12378 url = "mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.07.tar.gz";
··· 12373 LocaleGettext = buildPerlPackage { 12374 pname = "gettext"; 12375 version = "1.07"; 12376 + strictDeps = true; 12377 buildInputs = [ pkgs.gettext ]; 12378 src = fetchurl { 12379 url = "mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.07.tar.gz";