Merge pull request #171823 from Artturin/strictdeps1

pkgs/shells: enable strictDeps

pkgs/shells/any-nix-shell/default.nix

···
-{ lib, stdenv, fetchFromGitHub, makeWrapper }:
+{ lib, stdenv, fetchFromGitHub, makeWrapper, bash }:
 
 stdenv.mkDerivation rec {
   pname = "any-nix-shell";
···
     sha256 = "0q27rhjhh7k0qgcdcfm8ly5za6wm4rckh633d0sjz87faffkp90k";
   };
 
+  strictDeps = true;
   nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ bash ];
   installPhase = ''
     mkdir -p $out/bin
     cp -r bin $out

pkgs/shells/bash/5.1.nix

···
     "--disable-nls"
   ];
 
+  strictDeps = true;
   # Note: Bison is needed because the patches above modify parse.y.
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ bison ]
···
     if interactive
     then ''
       substituteInPlace "$out/bin/bashbug" \
-        --replace '${stdenv.shell}' "$out/bin/bash"
+        --replace '#!/bin/sh' "#!$out/bin/bash"
     ''
     # most space is taken by locale data
     else ''

pkgs/shells/bash/bash-completion/default.nix

···
     sha256 = "1b0iz7da1sgifx1a5wdyx1kxbzys53v0kyk8nhxfipllmm5qka3k";
   };
 
+  strictDeps = true;
   nativeBuildInputs = [ autoreconfHook ];
 
   # tests are super flaky unfortunately, and regularily break.

pkgs/shells/bash/nix-bash-completions/default.nix

···
     sha256 = "1n5zs6xcnv4bv1hdaypmz7fv4j7dsr4a0ifah99iyj4p5j85i1bc";
   };
 
+  strictDeps = true;
   # To enable lazy loading via. bash-completion we need a symlink to the script
   # from every command name.
   installPhase = ''

pkgs/shells/bash/undistract-me/default.nix

···
     })
   ];
 
+  strictDeps = true;
+
   # Patch in dependencies. Can't use makeWrapper because the bash
   # functions will be sourced and invoked in a different environment
   # for each command invocation.

pkgs/shells/bash/yarn-completion/default.nix

···
     sha256 = "0xflbrbwskjqv3knvc8jqygpvfxh5ak66q7w22d1ng8gwrfqzcng";
   };
 
+  strictDeps = true;
   nativeBuildInputs = [ installShellFiles ];
 
   installPhase = ''

pkgs/shells/dash/default.nix

···
     })
   ];
 
+  strictDeps = true;
   # configure.ac patched; remove on next release
   nativeBuildInputs = [ autoreconfHook ];
 

pkgs/shells/dgsh/default.nix

···
     license = with licenses; asl20;
     maintainers = with maintainers; [ vrthra ];
     platforms = with platforms; all;
+    # lib/freadseek.c:68:3: error: #error "Please port gnulib freadseek.c to your platform! Look at the definition of getc, getc_unlocked on your >
+    # 68 |  #error "Please port gnulib freadseek.c to your platform! Look at the definition of getc, getc_unlocked on your system, then report >
+    broken = true; # marked 2022-05-06
   };
 }

pkgs/shells/elvish/default.nix

···
 
   vendorSha256 = "sha256-iuklI7XEQUgZ2ObYRROxyiccZ1JkajK5OJA7hIcpRZQ=";
 
+  strictDeps = true;
   doCheck = false;
 
   doInstallCheck = true;

pkgs/shells/es/default.nix

···
     sourceRoot=.
   '';
 
-  buildInputs = [ readline bison ];
+  strictDeps = true;
+  nativeBuildInputs = [ bison ];
+  buildInputs = [ readline ];
 
   configureFlags = [ "--with-readline" ];
 

pkgs/shells/fish/default.nix

···
       rm tests/pexpects/exit_handlers.py
     '';
 
+    strictDeps = true;
     nativeBuildInputs = [
       cmake
       gettext

pkgs/shells/fish/oh-my-fish/default.nix

···
 , stdenv
 , fetchFromGitHub
 , fish
+, bash
 , runtimeShell
 , writeShellScript
 }:
···
     hash = "sha256-lwMo4+PcYR9kYJPWK+ALiMfBdxFSgB2vjtSn8QrmmEA=";
   };
 
+  strictDeps = true;
   buildInputs = [
     fish
+    bash
   ];
 
   dontConfigure = true;

pkgs/shells/jush/default.nix

···
     sha256 = "1azvghrh31gawd798a254ml4id642qvbva64zzg30pjszh1087n8";
   };
 
+  strictDeps = true;
   nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   buildInputs = [ editline ];

pkgs/shells/liquidprompt/default.nix

···
     sha256 = "sha256-ntCfXJUOQqL63HWoG+WJr9a+qB16AaL5zf58039t7GU=";
   };
 
+  strictDeps = true;
   installPhase = ''
     install -D -m 0444 liquidprompt $out/bin/liquidprompt
     install -D -m 0444 liquidpromptrc-dist $out/share/doc/liquidprompt/liquidpromptrc-dist

pkgs/shells/loksh/default.nix

···
     sha256 = "sha256-q5RiY9/xEFCk+oHlxgNwDOB+TNjRWHKzU2kQH2LjCWY=";
   };
 
+  strictDeps = true;
   nativeBuildInputs = [
     meson
     ninja
···
     platforms = platforms.linux;
   };
 }
-

pkgs/shells/mksh/default.nix

···
     hash = "sha256-d64WZaM38cSMYda5Yds+UhGbOOWIhNHIloSvMfh7xQY=";
   };
 
+  strictDeps = true;
   nativeBuildInputs = [
     installShellFiles
   ];

pkgs/shells/mrsh/default.nix

···
     sha256 = "0vvdwzw3fq74lwgmy6xxkk01sd68fzhsw84c750lm1dma22xhjci";
   };
 
+  strictDeps = true;
   nativeBuildInputs = [ meson ninja pkg-config ];
   buildInputs = [ readline ];
 

pkgs/shells/oil/default.nix

···
     mkdir -p $out/bin
   '';
 
+  strictDeps = true;
   buildInputs = lib.optional withReadline readline;
   configureFlags = lib.optional withReadline "--with-readline";
 

pkgs/shells/oksh/default.nix

···
     sha256 = "sha256-076nD0aPps6n5qkR3LQJ6Kn2g3mkov+/M0qSvxNLZ6o=";
   };
 
+  strictDeps = true;
+
   postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
     substituteInPlace configure --replace "./conftest" "echo"
   '';

pkgs/shells/pash/default.nix

···
     sha256 = "0c4wa8qi1zs01p9ck171jkw0n1rsymsrhpsb42gl7warwhpmv59f";
   };
 
+  strictDeps = true;
   preConfigure = "rm -rvf $src/Source/PashConsole/bin/*";
 
   outputFiles = [ "Source/PashConsole/bin/Release/*" ];

pkgs/shells/powershell/default.nix

···
     stripRoot = false;
   };
 
+  strictDeps = true;
   buildInputs = [ less ] ++ libraries;
   nativeBuildInputs = [ makeWrapper ]
     ++ lib.optional stdenv.isLinux autoPatchelfHook;

pkgs/shells/rc/default.nix

···
     sha256 = "1n5zz6d6z4z6s3fwa0pscqqawy561k4xfnmi91i626hcvls67ljy";
   };
 
+  strictDeps = true;
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ ncurses ]
     ++ lib.optionals (readline != null) [ readline ];

pkgs/shells/rush/default.nix

···
-{ fetchurl, lib, stdenv }:
+{ fetchurl, lib, stdenv, bash, perl }:
 
 stdenv.mkDerivation rec {
   pname = "rush";
···
     url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
     sha256 = "sha256-ld5TdpF7siprQCbhE4oxYhH40x3QZ5NCQlD3zRaNmM0=";
   };
+
+  strictDeps = true;
+  buildInputs = [ bash ];
+
+  postInstall = ''
+    substituteInPlace $out/bin/rush-po \
+      --replace "exec perl" "exec ${lib.getExe perl}"
+  '';
 
   doCheck = true;
 

pkgs/shells/scponly/default.nix

···
 
   patches = [ ./scponly-fix-make.patch ];
 
-  buildInputs = [ openssh ];
-
-  # Add path to sftp-server so configure finds it
-  preConfigure = "export PATH=$PATH:${openssh}/libexec";
+  strictDeps = true;
 
   # chroot doesn't seem to work, so not enabling
   # rsync could also be optionally enabled
-  configureFlags = [ "--enable-winscp-compat" ];
+  configureFlags = [
+    "--enable-winscp-compat"
+    "scponly_PROG_SFTP_SERVER=${lib.getBin openssh}/libexec/sftp-server"
+    "scponly_PROG_SCP=${lib.getBin openssh}/bin/scp"
+  ];
 
   postInstall = lib.optionalString (debugLevel > 0) ''
     mkdir -p $out/etc/scponly && echo ${

pkgs/shells/tcsh/default.nix

···
     hash = "sha256-YL4sUEvY8fpuQksZVkldfnztUqKslNtf0n9La/yPdPA=";
   };
 
+  strictDeps = true;
   buildInputs = [
     ncurses
   ];

pkgs/shells/yash/default.nix

···
     sha256 = "sha256:1jdmj4cyzwxxyyqf20y1zi578h7md860ryffp02qi143zpppn4sm";
   };
 
+  strictDeps = true;
   buildInputs = [ gettext ncurses ];
 
   meta = with lib; {

pkgs/shells/zsh/agkozak-zsh-prompt/default.nix

···
     sha256 = "sha256-TOfAWxw1uIV0hKV9o4EJjOlp+jmGWCONDex86ipegOY=";
   };
 
+  strictDeps = true;
   dontConfigure = true;
   dontBuild = true;
 

pkgs/shells/zsh/antigen/default.nix

···
     sha256 = "1bmp3qf14509swpxin4j9f98n05pdilzapjm0jdzbv0dy3hn20ix";
   };
 
+  strictDeps = true;
   dontUnpack = true;
 
   installPhase = ''

pkgs/shells/zsh/default.nix

···
     ./tz_completion.patch
   ];
 
-  nativeBuildInputs = [ autoreconfHook perl groff texinfo ]
+  strictDeps = true;
+  nativeBuildInputs = [ autoreconfHook perl groff texinfo pcre]
                       ++ lib.optionals stdenv.isLinux [ util-linux yodl ];
 
   buildInputs = [ ncurses pcre ];

pkgs/shells/zsh/fzf-zsh/default.nix

···
     sha256 = "1irjmxhcg1fm4g8p3psjqk7sz5qhj5kw73pyhv91njvpdhn9l26z";
   };
 
+  strictDeps = true;
   postPatch = ''
     substituteInPlace fzf-zsh.plugin.zsh \
       --replace \

pkgs/shells/zsh/gradle-completion/default.nix

···
     sha256 = "15b0692i3h8h7b95465b2aw9qf5qjmjag5n62347l8yl7zbhv3l2";
   };
 
+  strictDeps = true;
+
   # we just move two files into $out,
   # this shouldn't bother Hydra.
   preferLocalBuild = true;

pkgs/shells/zsh/grml-zsh-config/default.nix

···
     sha256 = "sha256-GEuBYN6HVAjiAbusVuEA7zBG9fIVZHLV628Jt6Cv5cM=";
   };
 
-  buildInputs = [ zsh coreutils txt2tags procps ]
+  strictDeps = true;
+  nativeBuildInputs = [ txt2tags ];
+  buildInputs = [ zsh coreutils procps ]
     ++ optional stdenv.isLinux inetutils;
 
   buildPhase = ''

pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix

···
     sha256 = "0fvxnvgbcvwii7ghvpj5l43frllq71wwjvfg7cqfmic727z001dh";
   };
 
+  strictDeps = true;
   installPhase = ''
     install -Dm0644 lambda-mod.zsh-theme $out/share/zsh/themes/lambda-mod.zsh-theme
   '';

pkgs/shells/zsh/nix-zsh-completions/default.nix

···
     sha256 = "1n9whlys95k4wc57cnz3n07p7zpkv796qkmn68a50ygkx6h3afqf";
   };
 
+  strictDeps = true;
   installPhase = ''
     mkdir -p $out/share/zsh/{site-functions,plugins/nix}
     cp _* $out/share/zsh/site-functions

pkgs/shells/zsh/oh-my-zsh/default.nix

···
 #
 #   https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=oh-my-zsh-git
 { lib, stdenv, fetchFromGitHub, nixosTests, writeScript, common-updater-scripts
-, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
+, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:
 
 stdenv.mkDerivation rec {
   version = "2022-04-24";
···
     repo = "ohmyzsh";
     sha256 = "yxuvVDjNCH7r/g6ZoF8kEzwirBB0s+CRQizBwRR4Sp4=";
   };
+
+  strictDeps = true;
+  buildInputs = [ bash ];
 
   installPhase = ''
     runHook preInstall

pkgs/shells/zsh/pure-prompt/default.nix

···
     sha256 = "sha256-iuLi0o++e0PqK81AKWfIbCV0CTIxq2Oki6U2oEYsr68=";
   };
 
+  strictDeps = true;
   installPhase = ''
     OUTDIR="$out/share/zsh/site-functions"
     mkdir -p "$OUTDIR"

pkgs/shells/zsh/spaceship-prompt/default.nix

···
     sha256 = "sha256-4G1+K6ENLwChtivR7Ura0vl6Ph9Wae3SOXCW1pNbgHI=";
   };
 
+  strictDeps = true;
   dontBuild = true;
 
   installPhase = ''

pkgs/shells/zsh/zinit/default.nix

···
   };
   # adapted from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zsh-zplugin-git
   dontBuild = true;
+  strictDeps = true;
   nativeBuildInputs = [ installShellFiles ];
   installPhase = ''
     outdir="$out/share/$pname"

pkgs/shells/zsh/zplug/default.nix

···
     sha256 = "0hci1pbs3k5icwfyfw5pzcgigbh9vavprxxvakg1xm19n8zb61b3";
   };
 
+  strictDeps = true;
   dontConfigure = true;
   dontBuild = true;
   dontPatch = true;

pkgs/shells/zsh/zsh-autocomplete/default.nix

···
     sha256 = "sha256-+UziTYsjgpiumSulrLojuqHtDrgvuG91+XNiaMD7wIs=";
   };
 
+  strictDeps = true;
   installPhase = ''
     install -D zsh-autocomplete.plugin.zsh $out/share/zsh-autocomplete/zsh-autocomplete.plugin.zsh
     cp -R scripts $out/share/zsh-autocomplete/scripts

pkgs/shells/zsh/zsh-autopair/default.nix

···
     sha256 = "1h0vm2dgrmb8i2pvsgis3lshc5b0ad846836m62y8h3rdb3zmpy1";
   };
 
+  strictDeps = true;
+
   installPhase = ''
     install -D autopair.zsh $out/share/zsh/${pname}/autopair.zsh
   '';

pkgs/shells/zsh/zsh-autosuggestions/default.nix

···
     sha256 = "1g3pij5qn2j7v7jjac2a63lxd97mcsgw6xq6k5p7835q9fjiid98";
   };
 
+  strictDeps = true;
   buildInputs = [ zsh ];
 
   installPhase = ''

pkgs/shells/zsh/zsh-bd/default.nix

···
     sha256 = "020f8nq86g96cps64hwrskppbh2dapfw2m9np1qbs5pgh16z4fcb";
   };
 
+  strictDeps = true;
   dontBuild = true;
 
   installPhase = ''

pkgs/shells/zsh/zsh-better-npm-completion/default.nix

···
     sha256 = "16z7k5n1rcl9i61lrm7i5dsqsmhvdp1y4y5ii6hv2xpp470addgy";
   };
 
+  strictDeps = true;
   installPhase = ''
     install -Dm 0644 zsh-better-npm-completion.plugin.zsh $out/share/zsh-better-npm-completion
   '';

pkgs/shells/zsh/zsh-clipboard/default.nix

···
 
   src = ./.;
 
+  strictDeps = true;
   dontBuild = true;
 
   installPhase = ''

pkgs/shells/zsh/zsh-command-time/default.nix

···
     sha256 = "1bvyjgz6bhgg1nwr56r50p6fblgah6yiql55pgm5abnn2h876fjq";
   };
 
+  strictDeps = true;
   dontUnpack = true;
 
   installPhase = ''

pkgs/shells/zsh/zsh-completions/default.nix

···
     sha256 = "0vs14n29wvkai84fvz3dz2kqznwsq2i5fzbwpv8nsfk1126ql13i";
   };
 
+  strictDeps = true;
   installPhase= ''
     install -D --target-directory=$out/share/zsh/site-functions src/*
   '';

pkgs/shells/zsh/zsh-deer/default.nix

···
     sha256 = "1xnbnbi0zk2xsyn8dqsmyxqlfnl36pb1wwibnlp0dxixw6sfymyl";
   };
 
+  strictDeps = true;
+
   prePatch = ''
     substituteInPlace deer \
       --replace " perl " " ${perl}/bin/perl "

pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix

···
     sha256 = "0h7f27gz586xxw7cc0wyiv3bx0x3qih2wwh05ad85bh2h834ar8d";
   };
 
+  strictDeps = true;
   dontConfigure = true;
   dontBuild = true;
 

pkgs/shells/zsh/zsh-fzf-tab/default.nix

···
     sha256 = "h/3XP/BiNnUgQI29gEBl6RFee77WDhFyvsnTi1eRbKg=";
   };
 
+  strictDeps = true;
   buildInputs = [ ncurses ];
 
   patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ];

pkgs/shells/zsh/zsh-history-search-multi-word/default.nix

···
     sha256 = "11r2mmy6bg3b6pf6qc0ml3idh333cj8yz754hrvd1sc4ipfkkqh7";
   };
 
+  strictDeps = true;
   dontConfigure = true;
   dontBuild = true;
 

pkgs/shells/zsh/zsh-history-substring-search/default.nix

···
     sha256 = "0y8va5kc2ram38hbk2cibkk64ffrabfv1sh4xm7pjspsba9n5p1y";
   };
 
+  strictDeps = true;
   installPhase = ''
     install -D zsh-history-substring-search.zsh \
       "$out/share/zsh-history-substring-search/zsh-history-substring-search.zsh"

pkgs/shells/zsh/zsh-nix-shell/default.nix

···
-{ lib, stdenv, fetchFromGitHub, pkgs }:
+{ lib, stdenv, fetchFromGitHub, bash }:
 
 # To make use of this derivation, use
 # `programs.zsh.interactiveShellInit = "source ${pkgs.zsh-nix-shell}/share/zsh-nix-shell/nix-shell.plugin.zsh";`
···
     sha256 = "sha256-719lVo6p55G1tt3+6nMhZ904nyvlq0Q5exb0il36/Aw=";
   };
 
+  strictDeps = true;
+  buildInputs = [ bash ];
   installPhase = ''
     install -D nix-shell.plugin.zsh --target-directory=$out/share/zsh-nix-shell
     install -D scripts/* --target-directory=$out/share/zsh-nix-shell/scripts

pkgs/shells/zsh/zsh-powerlevel10k/default.nix

···
-{ lib, stdenv, fetchFromGitHub, substituteAll, pkgs }:
+{ lib, stdenv, fetchFromGitHub, substituteAll, pkgs, bash }:
 
 # To make use of this derivation, use
 # `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme";`
···
     rev = "v${version}";
     sha256 = "0fkfh8j7rd8mkpgz6nsx4v7665d375266shl1aasdad8blgqmf0c";
   };
+
+  strictDeps = true;
+  buildInputs = [ bash ];
 
   patches = [
     (substituteAll {

pkgs/shells/zsh/zsh-powerlevel9k/default.nix

···
     sha256 = "0v1dqg9hvycdkcvklg2njff97xwr8rah0nyldv4xm39r77f4yfvq";
   };
 
+  strictDeps = true;
   installPhase= ''
     install -D powerlevel9k.zsh-theme --target-directory=$out/share/zsh-powerlevel9k
     install -D functions/* --target-directory=$out/share/zsh-powerlevel9k/functions

pkgs/shells/zsh/zsh-prezto/default.nix

···
-{ lib, stdenv, fetchFromGitHub, unstableGitUpdater }:
+{ lib, stdenv, fetchFromGitHub, unstableGitUpdater, bash }:
 
 stdenv.mkDerivation rec {
   pname = "zsh-prezto";
···
     sha256 = "05n2801xqdxc5nx0709mak1pr73l7aq5azd9adm0ym7si3vl59sj";
     fetchSubmodules = true;
   };
+
+  strictDeps = true;
+  buildInputs = [ bash ];
 
   postPatch = ''
     # make zshrc aware of where zsh-prezto is installed

pkgs/shells/zsh/zsh-syntax-highlighting/default.nix

···
     sha256 = "03r6hpb5fy4yaakqm3lbf4xcvd408r44jgpv4lnzl9asp4sb9qc0";
   };
 
+  strictDeps = true;
   buildInputs = [ zsh ];
 
   installFlags = [ "PREFIX=$(out)" ];

pkgs/shells/zsh/zsh-system-clipboard/default.nix

···
     sha256 = "09lqav1mz5zajklr3xa0iaivhpykv3azkjb7yj9wyp0hq3vymp8i";
   };
 
+  strictDeps = true;
   installPhase = ''
     install -D zsh-system-clipboard.zsh $out/share/zsh/${pname}/zsh-system-clipboard.zsh
   '';

pkgs/shells/zsh/zsh-vi-mode/default.nix

···
     sha256 = "EOYqHh0rcgoi26eopm6FTl81ehak5kXMmzNcnJDH8/E=";
   };
 
+  strictDeps = true;
   dontBuild = true;
 
   installPhase = ''

pkgs/shells/zsh/zsh-you-should-use/default.nix

···
     sha256 = "1dz48rd66priqhxx7byndqhbmlwxi1nfw8ik25k0z5k7k754brgy";
   };
 
+  strictDeps = true;
   dontBuild = true;
 
   installPhase = ''

pkgs/shells/zsh/zsh-z/default.nix

···
     sha256 = "sha256-HnwUWqzwavh/Qox+siOe5lwTp7PBdiYx+9M0NMNFx00=";
   };
 
+  strictDeps = true;
   dontBuild = true;
 
   installPhase = ''

pkgs/tools/misc/shellspec/default.nix

···
-{ lib, stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub, bash }:
 
 stdenv.mkDerivation rec {
   pname = "shellspec";
···
     sha256 = "1ib5qp29f2fmivwnv6hq35qhvdxz42xgjlkvy0i3qn758riyqf46";
   };
 
+  strictDeps = true;
+  buildInputs = [ bash ];
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
   checkPhase = ''