commit f81ec80ff8d0a8b305606a1811aa9a7ee469d437 · pyrox.dev/nixpkgs

+2 -2

pkgs/by-name/gr/groff/package.nix

···

       22
       22
        
         pkg-config,

     

       23
       23
        
         texinfo,

     

       24
       24
        
         bison,

     

       25
       25
       -
         bash,

     

       25
       25
       +
         bashNonInteractive,

     

       26
       26
        
       }:

     

       27
       27
        
       

     

       28
       28
        
       stdenv.mkDerivation rec {

     
···

       79
       79
        
         buildInputs =

     

       80
       80
        
           [

     

       81
       81
        
             perl

     

       82
       82
       -
             bash

     

       82
       82
       +
             bashNonInteractive

     

       83
       83
        
           ]

     

       84
       84
        
           ++ lib.optionals enableGhostscript [

     

       85
       85
        
             ghostscript

+2 -2

pkgs/by-name/li/libxo/package.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         autoreconfHook,

     

       4
       4
       -
         bash,

     

       4
       4
       +
         bashNonInteractive,

     

       5
       5
        
         libtool,

     

       6
       6
        
         fetchFromGitHub,

     

       7
       7
        
         nix-update-script,

     
···

       48
       48
        
         buildInputs = [

     

       49
       49
        
           autoreconfHook

     

       50
       50
        
           # For patchShebangs in postInstall

     

       51
       51
       -
           bash

     

       51
       51
       +
           bashNonInteractive

     

       52
       52
        
           perl

     

       53
       53
        
         ];

     

       54
       54

+4 -4

pkgs/development/interpreters/python/cpython/default.nix

···

       25
       25
        
       , zlib

     

       26
       26
        
       

     

       27
       27
        
       # platform-specific dependencies

     

       28
       28
       -
       , bash

     

       28
       28
       +
       , bashNonInteractive

     

       29
       29
        
       , darwin

     

       30
       30
        
       , windows

     

       31
       31
        
       

     
···

       237
       237
        
       

     

       238
       238
        
         inherit nativeBuildInputs;

     

       239
       239
        
         buildInputs = lib.optionals (!stdenv.hostPlatform.isWindows) [

     

       240
       240
       -
           bash # only required for patchShebangs

     

       240
       240
       +
           bashNonInteractive # only required for patchShebangs

     

       241
       241
        
         ] ++ buildInputs;

     

       242
       242
        
       

     

       243
       243
        
         prePatch = optionalString stdenv.hostPlatform.isDarwin ''

     
···

       334
       334
        
       

     

       335
       335
        
         postPatch = optionalString (!stdenv.hostPlatform.isWindows) ''

     

       336
       336
        
           substituteInPlace Lib/subprocess.py \

     

       337
       337
       -
             --replace-fail "'/bin/sh'" "'${bash}/bin/sh'"

     

       337
       337
       +
             --replace-fail "'/bin/sh'" "'${bashNonInteractive}/bin/sh'"

     

       338
       338
        
         '' + optionalString mimetypesSupport ''

     

       339
       339
        
           substituteInPlace Lib/mimetypes.py \

     

       340
       340
        
             --replace-fail "@mime-types@" "${mailcap}"

     
···

       616
       616
        
         ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

     

       617
       617
        
           # Ensure we don't have references to build-time packages.

     

       618
       618
        
           # These typically end up in shebangs.

     

       619
       619
       -
           pythonOnBuildForHost buildPackages.bash

     

       619
       619
       +
           pythonOnBuildForHost buildPackages.bashNonInteractive

     

       620
       620
        
         ];

     

       621
       621
        
       

     

       622
       622
        
         separateDebugInfo = true;

+2 -2

pkgs/development/libraries/gettext/default.nix

···

       3
       3
        
         lib,

     

       4
       4
        
         fetchurl,

     

       5
       5
        
         libiconv,

     

       6
       6
       -
         bash,

     

       6
       6
       +
         bashNonInteractive,

     

       7
       7
        
         updateAutotoolsGnuConfigScriptsHook,

     

       8
       8
        
       }:

     

       9
       9
        
       

     
···

       84
       84
        
         ];

     

       85
       85
        
         buildInputs =

     

       86
       86
        
           lib.optionals (!stdenv.hostPlatform.isMinGW) [

     

       87
       87
       -
             bash

     

       87
       87
       +
             bashNonInteractive

     

       88
       88
        
           ]

     

       89
       89
        
           ++ lib.optionals (!stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isCygwin) [

     

       90
       90
        
             # HACK, see #10874 (and 14664)

+2 -2

pkgs/development/tools/misc/texinfo/common.nix

···

       5
       5
        
         fetchurl,

     

       6
       6
        
         perl,

     

       7
       7
        
         libintl,

     

       8
       8
       -
         bash,

     

       8
       8
       +
         bashNonInteractive,

     

       9
       9
        
         updateAutotoolsGnuConfigScriptsHook,

     

       10
       10
        
         gnulib,

     

       11
       11
        
         gawk,

     
···

       83
       83
        
         nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];

     

       84
       84
        
         buildInputs =

     

       85
       85
        
           [

     

       86
       86
       -
             bash

     

       86
       86
       +
             bashNonInteractive

     

       87
       87
        
             libintl

     

       88
       88
        
           ]

     

       89
       89
        
           ++ optionals stdenv.hostPlatform.isSunOS [

+2 -2

pkgs/development/tools/misc/texinfo/packages.nix

···

       6
       6
        
         fetchurl,

     

       7
       7
        
         perl,

     

       8
       8
        
         libintl,

     

       9
       9
       -
         bash,

     

       9
       9
       +
         bashNonInteractive,

     

       10
       10
        
         updateAutotoolsGnuConfigScriptsHook,

     

       11
       11
        
         gnulib,

     

       12
       12
        
         gawk,

     
···

       57
       57
        
             xz

     

       58
       58
        
             libintl

     

       59
       59
        
             libiconv

     

       60
       60
       -
             bash

     

       60
       60
       +
             bashNonInteractive

     

       61
       61
        
             gnulib

     

       62
       62
        
             gawk

     

       63
       63
        
             freebsd

+5 -5

pkgs/shells/bash/5.nix

···

       6
       6
        
       , bison

     

       7
       7
        
       , util-linux

     

       8
       8
        
       

     

       9
       9
       -
         # patch for cygwin requires readline support

     

       10
       10
       -
       , interactive ? stdenv.hostPlatform.isCygwin

     

       9
       9
       +
       , interactive ? true

     

       11
       10
        
       , readline

     

       12
       12
       -
       , withDocs ? false

     

       13
       13
       -
       , texinfo

     

       11
       11
       +
       , withDocs ? null

     

       14
       12
        
       , forFHSEnv ? false

     

       15
       13
        
       

     

       16
       14
        
       , pkgsStatic

     
···

       22
       20
        
           inherit sha256;

     

       23
       21
        
         });

     

       24
       22
        
       in

     

       23
       23
       +
       lib.warnIf (withDocs != null) ''

     

       24
       24
       +
         bash: `.override { withDocs = true; }` is deprecated, the docs are always included.

     

       25
       25
       +
       ''

     

       25
       26
        
       stdenv.mkDerivation rec {

     

       26
       27
        
         pname = "bash${lib.optionalString interactive "-interactive"}";

     

       27
       28
        
         version = "5.2${patch_suffix}";

     
···

       101
       102
        
         # Note: Bison is needed because the patches above modify parse.y.

     

       102
       103
        
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       103
       104
        
         nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook bison ]

     

       104
       104
       -
           ++ lib.optional withDocs texinfo

     

       105
       105
        
           ++ lib.optional stdenv.hostPlatform.isDarwin stdenv.cc.bintools;

     

       106
       106
        
       

     

       107
       107
        
         buildInputs = lib.optional interactive readline;

+11 -11

pkgs/stdenv/darwin/default.nix

···

       153
       153
        
                   runtimeShell = prevStage.ccWrapperStdenv.shell;

     

       154
       154
        
                 };

     

       155
       155
        
       

     

       156
       156
       -
             bash = prevStage.bash or bootstrapTools;

     

       156
       156
       +
             bashNonInteractive = prevStage.bashNonInteractive or bootstrapTools;

     

       157
       157
        
       

     

       158
       158
        
             thisStdenv = import ../generic {

     

       159
       159
        
               name = "${name}-stdenv-darwin";

     
···

       168
       168
        
               inherit extraNativeBuildInputs;

     

       169
       169
        
       

     

       170
       170
        
               preHook =

     

       171
       171
       -
                 lib.optionalString (!isBuiltByNixpkgsCompiler bash) ''

     

       171
       171
       +
                 lib.optionalString (!isBuiltByNixpkgsCompiler bashNonInteractive) ''

     

       172
       172
        
                   # Don't patch #!/interpreter because it leads to retained

     

       173
       173
        
                   # dependencies on the bootstrapTools in the final stdenv.

     

       174
       174
        
                   dontPatchShebangs=1

     
···

       181
       181
        
                   export PATH_LOCALE=${prevStage.darwin.locale}/share/locale

     

       182
       182
        
                 '';

     

       183
       183
        
       

     

       184
       184
       -
               shell = bash + "/bin/bash";

     

       184
       184
       +
               shell = bashNonInteractive + "/bin/bash";

     

       185
       185
        
               initialPath = [

     

       186
       186
       -
                 bash

     

       186
       186
       +
                 bashNonInteractive

     

       187
       187
        
                 prevStage.file

     

       188
       188
        
                 bootstrapTools

     

       189
       189
        
               ];

     
···

       328
       328
        
         # SDK packages include propagated packages and source release packages built during the bootstrap.

     

       329
       329
        
         sdkPackages = prevStage: {

     

       330
       330
        
           inherit (prevStage)

     

       331
       331
       -
             bash

     

       331
       331
       +
             bashNonInteractive

     

       332
       332
        
             libpng

     

       333
       333
        
             libxml2

     

       334
       334
        
             libxo

     
···

       408
       408
        
               # stage should only access the stage that came before it.

     

       409
       409
        
               ccWrapperStdenv = self.stdenv;

     

       410
       410
        
       

     

       411
       411
       -
               bash = bootstrapTools // {

     

       411
       411
       +
               bashNonInteractive = bootstrapTools // {

     

       412
       412
        
                 shellPath = "/bin/bash";

     

       413
       413
        
               };

     

       414
       414
        
       

     
···

       600
       600
        
             (llvmLibrariesPackages prevStage)

     

       601
       601
        
             {

     

       602
       602
        
               inherit (prevStage)

     

       603
       603
       -
                 bash

     

       603
       603
       +
                 bashNonInteractive

     

       604
       604
        
                 cctools

     

       605
       605
        
                 coreutils

     

       606
       606
        
                 cpio

     
···

       847
       847
        
                   inherit (prevStage) ccWrapperStdenv;

     

       848
       848
        
       

     

       849
       849
        
                   # Avoid an infinite recursion due to the SDK’s including ncurses, which depends on bash in its `dev` output.

     

       850
       850
       -
                   bash = super.bash.override { stdenv = self.darwin.bootstrapStdenv; };

     

       850
       850
       +
                   bashNonInteractive = super.bashNonInteractive.override { stdenv = self.darwin.bootstrapStdenv; };

     

       851
       851
        
       

     

       852
       852
        
                   # Avoid pulling in a full python and its extra dependencies for the llvm/clang builds.

     

       853
       853
        
                   libxml2 = super.libxml2.override { pythonSupport = false; };

     

       854
       854
        
       

     

       855
       855
        
                   # Use Bash from this stage to avoid propagating Bash from a previous stage to the final stdenv.

     

       856
       856
        
                   ncurses = super.ncurses.override {

     

       857
       857
       -
                     stdenv = self.darwin.bootstrapStdenv.override { shell = lib.getExe self.bash; };

     

       857
       857
       +
                     stdenv = self.darwin.bootstrapStdenv.override { shell = lib.getExe self.bashNonInteractive; };

     

       858
       858
        
                   };

     

       859
       859
        
       

     

       860
       860
        
                   darwin = super.darwin.overrideScope (

     
···

       1162
       1162
        
               extraAttrs = {

     

       1163
       1163
        
                 inherit bootstrapTools;

     

       1164
       1164
        
                 libc = prevStage.darwin.libSystem;

     

       1165
       1165
       -
                 shellPackage = prevStage.bash;

     

       1165
       1165
       +
                 shellPackage = prevStage.bashNonInteractive;

     

       1166
       1166
        
               };

     

       1167
       1167
        
       

     

       1168
       1168
        
               disallowedRequisites = [ bootstrapTools.out ];

     
···

       1172
       1172
        
                   with prevStage;

     

       1173
       1173
        
                   [

     

       1174
       1174
        
                     apple-sdk

     

       1175
       1175
       -
                     bash

     

       1175
       1175
       +
                     bashNonInteractive

     

       1176
       1176
        
                     bzip2.bin

     

       1177
       1177
        
                     bzip2.out

     

       1178
       1178
        
                     cc.expand-response-params

+4 -4

pkgs/stdenv/freebsd/default.nix

···

       74
       74
        
           expand-response-params = "";

     

       75
       75
        
           bsdcp = linkBootstrap { paths = [ "bin/bsdcp" ]; };

     

       76
       76
        
           patchelf = linkBootstrap { paths = [ "bin/patchelf" ]; };

     

       77
       77
       -
           bash = linkBootstrap {

     

       77
       77
       +
           bashNonInteractive = linkBootstrap {

     

       78
       78
        
             paths = [

     

       79
       79
        
               "bin/bash"

     

       80
       80
        
               "bin/sh"

     
···

       376
       376
        
               gawk

     

       377
       377
        
               diffutils

     

       378
       378
        
               patch

     

       379
       379
       -
               bash

     

       379
       379
       +
               bashNonInteractive

     

       380
       380
        
               xz

     

       381
       381
        
               gzip

     

       382
       382
        
               bzip2

     

       383
       383
        
               bsdcp

     

       384
       384
        
             ];

     

       385
       385
       -
             shell = "${prevStage.bash}/bin/bash";

     

       385
       385
       +
             shell = "${prevStage.bashNonInteractive}/bin/bash";

     

       386
       386
        
             stdenvNoCC = import ../generic {

     

       387
       387
        
               inherit

     

       388
       388
        
                 config

     
···

       471
       471
        
               # we CAN'T import LLVM because the compiler built here is used to build the final compiler and the final compiler must not be built by the bootstrap compiler

     

       472
       472
        
               inherit (bootstrapTools)

     

       473
       473
        
                 patchelf

     

       474
       474
       -
                 bash

     

       474
       474
       +
                 bashNonInteractive

     

       475
       475
        
                 curl

     

       476
       476
        
                 coreutils

     

       477
       477
        
                 diffutils

+1 -1

pkgs/stdenv/generic/common-path.nix

···

       10
       10
        
         pkgs.gzip

     

       11
       11
        
         pkgs.bzip2.bin

     

       12
       12
        
         pkgs.gnumake

     

       13
       13
       -
         pkgs.bash

     

       13
       13
       +
         pkgs.bashNonInteractive

     

       14
       14
        
         pkgs.patch

     

       15
       15
        
         pkgs.xz.bin

     

       16
       16

+3 -3

pkgs/stdenv/linux/default.nix

···

       770
       770
        
                     bzip2

     

       771
       771
        
                     xz

     

       772
       772
        
                     zlib

     

       773
       773
       -
                     bash

     

       773
       773
       +
                     bashNonInteractive

     

       774
       774
        
                     binutils

     

       775
       775
        
                     coreutils

     

       776
       776
        
                     diffutils

     
···

       806
       806
        
                     gzip

     

       807
       807
        
                     bzip2

     

       808
       808
        
                     xz

     

       809
       809
       -
                     bash

     

       809
       809
       +
                     bashNonInteractive

     

       810
       810
        
                     binutils.bintools

     

       811
       811
        
                     coreutils

     

       812
       812
        
                     diffutils

     
···

       866
       866
        
                     gzip

     

       867
       867
        
                     bzip2

     

       868
       868
        
                     xz

     

       869
       869
       -
                     bash

     

       869
       869
       +
                     bashNonInteractive

     

       870
       870
        
                     coreutils

     

       871
       871
        
                     diffutils

     

       872
       872
        
                     findutils

+2 -2

pkgs/tools/compression/zstd/default.nix

···

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
        
         cmake,

     

       6
       6
       -
         bash,

     

       6
       6
       +
         bashNonInteractive,

     

       7
       7
        
         gnugrep,

     

       8
       8
        
         fixDarwinDylibNames,

     

       9
       9
        
         file,

     
···

       37
       37
        
         };

     

       38
       38
        
       

     

       39
       39
        
         nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;

     

       40
       40
       -
         buildInputs = lib.optional stdenv.hostPlatform.isUnix bash;

     

       40
       40
       +
         buildInputs = lib.optional stdenv.hostPlatform.isUnix bashNonInteractive;

     

       41
       41
        
       

     

       42
       42
        
         patches = [

     

       43
       43
        
           # This patches makes sure we do not attempt to use the MD5 implementation

+8 -9

pkgs/top-level/all-packages.nix

···

       5584
       5584
        
         ### SHELLS

     

       5585
       5585
        
       

     

       5586
       5586
        
         runtimeShell = "${runtimeShellPackage}${runtimeShellPackage.shellPath}";

     

       5587
       5587
       -
         runtimeShellPackage = bash;

     

       5587
       5587
       +
         runtimeShellPackage = bashNonInteractive;

     

       5588
       5588
        
       

     

       5589
       5589
       -
         bash = lowPrio (callPackage ../shells/bash/5.nix { });

     

       5589
       5589
       +
         bash = callPackage ../shells/bash/5.nix { };

     

       5590
       5590
       +
         bashNonInteractive = lowPrio (callPackage ../shells/bash/5.nix {

     

       5591
       5591
       +
           interactive = false;

     

       5592
       5592
       +
         });

     

       5590
       5593
        
         # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed

     

       5591
       5591
       -
         bashInteractive = callPackage ../shells/bash/5.nix {

     

       5592
       5592
       -
           interactive = true;

     

       5593
       5593
       -
           withDocs = true;

     

       5594
       5594
       -
         };

     

       5595
       5595
       -
         bashInteractiveFHS = callPackage ../shells/bash/5.nix {

     

       5596
       5596
       -
           interactive = true;

     

       5597
       5597
       -
           withDocs = true;

     

       5594
       5594
       +
         bashInteractive = bash;

     

       5595
       5595
       +
         bashFHS = callPackage ../shells/bash/5.nix {

     

       5598
       5596
        
           forFHSEnv = true;

     

       5599
       5597
        
         };

     

       5598
       5598
       +
         bashInteractiveFHS = bashFHS;

     

       5600
       5599
        
       

     

       5601
       5600
        
         carapace = callPackage ../shells/carapace {

     

       5602
       5601
        
           buildGoModule = buildGo123Module;