treewide: load structured attributes in all bash builders consistently (

#357053)

doc/stdenv/stdenv.chapter.md

@@ -75,17 +75,9 @@ stdenv.mkDerivation {
 }
 ```
 
-where the builder can do anything it wants, but typically starts with
+where `stdenv` sets up the environment automatically (e.g. by resetting `PATH` and populating it from build inputs). If you want, you can use `stdenv`’s generic builder:
 
 ```bash
-source $stdenv/setup
-```
-
-to let `stdenv` set up the environment (e.g. by resetting `PATH` and populating it from build inputs). If you want, you can still use `stdenv`’s generic builder:
-
-```bash
-source $stdenv/setup
-
 buildPhase() {
   echo "... this is my custom build phase ..."
   gcc foo.c -o foo
@@ -1276,7 +1268,7 @@ addEnvHooks "$hostOffset" myBashFunction
 
 The *existence* of setups hooks has long been documented and packages inside Nixpkgs are free to use this mechanism. Other packages, however, should not rely on these mechanisms not changing between Nixpkgs versions. Because of the existing issues with this system, there’s little benefit from mandating it be stable for any period of time.
 
-First, let’s cover some setup hooks that are part of Nixpkgs default `stdenv`. This means that they are run for every package built using `stdenv.mkDerivation` or when using a custom builder that has `source $stdenv/setup`. Some of these are platform specific, so they may run on Linux but not Darwin or vice-versa.
+First, let’s cover some setup hooks that are part of Nixpkgs default `stdenv`. This means that they are run for every package built using `stdenv.mkDerivation`, even with custom builders. Some of these are platform specific, so they may run on Linux but not Darwin or vice-versa.
 
 ### `move-docs.sh` {#move-docs.sh}
 

nixos/lib/make-system-tarball.sh

@@ -1,5 +1,3 @@
-source $stdenv/setup
-
 sources_=($sources)
 targets_=($targets)
 

nixos/modules/services/computing/slurm/slurm.nix

@@ -331,7 +331,6 @@ in
         name = "wrappedSlurm";
 
         builder = pkgs.writeText "builder.sh" ''
-          source $stdenv/setup
           mkdir -p $out/bin
           find  ${lib.getBin cfg.package}/bin -type f -executable | while read EXE
           do

nixos/modules/services/networking/ircd-hybrid/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 doSub() {
     local src=$1
     local dst=$2

nixos/modules/services/web-servers/jboss/builder.sh

@@ -1,8 +1,5 @@
 set -e
 
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 mkdir -p $out/bin
 
 cat > $out/bin/control <<EOF

nixos/modules/system/etc/test.nix

@@ -64,7 +64,14 @@ lib.recurseIntoAttrs {
       } ''
       mkdir fake-root
       export FAKECHROOT_EXCLUDE_PATH=/dev:/proc:/sys:${builtins.storeDir}:$out
-      fakechroot fakeroot chroot $PWD/fake-root bash -c 'source $stdenv/setup; eval "$fakeRootCommands"'
+      if [ -e "$NIX_ATTRS_SH_FILE" ]; then
+        export FAKECHROOT_EXCLUDE_PATH=$FAKECHROOT_EXCLUDE_PATH:$NIX_ATTRS_SH_FILE
+      fi
+      fakechroot fakeroot chroot $PWD/fake-root bash -e -c '
+        if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; fi
+        source $stdenv/setup
+        eval "$fakeRootCommands"
+      '
     '';
 
 }

pkgs/applications/audio/pianoteq/default.nix

@@ -111,8 +111,6 @@ let
     stdenv.mkDerivation {
       inherit name;
       builder = writeShellScript "builder.sh" ''
-        source $stdenv/setup
-
         curlVersion=$(${curl}/bin/curl -V | head -1 | cut -d' ' -f2)
 
         # Curl flags to handle redirects, not use EPSV, handle cookies for

pkgs/applications/emulators/wine/builder-wow.sh

@@ -1,6 +1,4 @@
 ## build described at https://wiki.winehq.org/Building_Wine#Shared_WoW64
-
-source $stdenv/setup
 preFlags="${configureFlags}"
 
 unpackPhase

pkgs/build-support/docker/default.nix

@@ -980,7 +980,8 @@ rec {
 
             mkdir $out
             ${if enableFakechroot then ''
-              proot -r $PWD/old_out ${bind-paths} --pwd=/ fakeroot bash -c '
+              proot -r $PWD/old_out ${bind-paths} --pwd=/ fakeroot bash -e -c '
+                if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; fi
                 source $stdenv/setup
                 eval "$fakeRootCommands"
                 tar \
@@ -994,7 +995,8 @@ rec {
                   -cf $out/layer.tar .
               '
             '' else ''
-              fakeroot bash -c '
+              fakeroot bash -e -c '
+                if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; fi
                 source $stdenv/setup
                 cd old_out
                 eval "$fakeRootCommands"

pkgs/build-support/fetchbzr/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source "$stdenv/setup"
-
 echo "exporting \`$url' (revision $rev) into \`$out'"
 
 # Perform a lightweight checkout so that we don't end up importing

pkgs/build-support/fetchcvs/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 (echo "#!$SHELL"; \
  echo 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "$@"') > ssh
 chmod +x ssh

pkgs/build-support/fetchdarcs/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 tagtext=""
 tagflags=""
 # Darcs hashes are sha1 (120 bits, 40-character hex)

pkgs/build-support/fetchdocker/fetchdocker-builder.sh

@@ -1,5 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source "${stdenv}/setup"
 echo "exporting ${repository}/${imageName} (tag: ${tag}) into ${out}"
 mkdir -p "${out}"
 

pkgs/build-support/fetchdocker/generic-fetcher.nix

@@ -35,7 +35,6 @@ in
 stdenv.mkDerivation {
   inherit name;
   builder = writeText "${fetcher}-builder.sh" ''
-    source "$stdenv/setup"
     echo "${fetcher} exporting to $out"
 
     declare -A creds

pkgs/build-support/fetchfirefoxaddon/default.nix

@@ -33,8 +33,6 @@ stdenv.mkDerivation {
   };
 
   builder = writeScript "xpibuilder" ''
-    source $stdenv/setup
-
     echo "firefox addon $name into $out"
 
     UUID="${extid}"

pkgs/build-support/fetchfossil/builder.sh

@@ -1,5 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
 echo "Cloning Fossil $url [$rev] into $out"
 
 # Fossil, bless its adorable little heart, wants to write global configuration

pkgs/build-support/fetchgit/builder.sh

@@ -3,8 +3,6 @@
 # - revision specified and remote has a HEAD
 # - revision specified and remote without HEAD
 #
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
 
 echo "exporting $url (rev $rev) into $out"
 

pkgs/build-support/fetchhg/builder.sh

@@ -1,5 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
 echo "getting $url${rev:+ ($rev)} into $out"
 
 hg clone --insecure "$url" hg-clone

pkgs/build-support/fetchipfs/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 # Curl flags to handle redirects, not use EPSV, handle cookies for
 # servers to need them during redirects, and work on SSL without a
 # certificate (this isn't a security problem because we check the

pkgs/build-support/fetchmtn/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 set -x
 
 if ! [ -f "$cacheDB" ]; then

pkgs/build-support/fetchsvn/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 echo "exporting $url (r$rev) into $out"
 
 if test -n "$http_proxy"; then

pkgs/build-support/fetchsvnssh/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 echo "exporting $url (r$rev) into $out"
 
 if test "$sshSupport"; then

pkgs/build-support/fetchurl/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 source $mirrorsFile
 
 curlVersion=$(curl -V | head -1 | cut -d' ' -f2)

pkgs/build-support/fetchurl/write-mirror-list.sh

@@ -1,4 +1,2 @@
-source $stdenv/setup
-
 # !!! this is kinda hacky.
 set | grep -E '^[a-zA-Z]+=.*://' > $out

pkgs/build-support/kernel/make-initrd.sh

@@ -1,5 +1,3 @@
-source $stdenv/setup
-
 set -o pipefail
 
 objects=($objects)

pkgs/build-support/kernel/modules-closure.sh

@@ -1,5 +1,3 @@
-source $stdenv/setup
-
 # When no modules are built, the $out/lib/modules directory will not
 # exist. Because the rest of the script assumes it does exist, we
 # handle this special case first.

pkgs/build-support/substitute-files/substitute-all-files.nix

@@ -5,7 +5,6 @@ args:
 stdenv.mkDerivation ({
   name = if args ? name then args.name else baseNameOf (toString args.src);
   builder = builtins.toFile "builder.sh" ''
-    source $stdenv/setup
     set -o pipefail
 
     eval "$preInstall"

pkgs/build-support/substitute/substitute-all.sh

@@ -1,5 +1,3 @@
-source $stdenv/setup
-
 eval "$preInstall"
 
 args=

pkgs/build-support/substitute/substitute.sh

@@ -1,5 +1,3 @@
-source $stdenv/setup
-
 args=
 
 target=$out

pkgs/by-name/bo/boot/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 boot_bin=$out/bin/boot
 
 mkdir -pv $(dirname $boot_bin)

pkgs/by-name/in/invidious/videojs.sh

@@ -1,5 +1,3 @@
-source $stdenv/setup
-
 unpackPhase
 cd source
 # this helper downloads the videojs files and checks their checksums

pkgs/by-name/k2/k2pdfopt/package.nix

@@ -61,7 +61,6 @@ let
       patchCommands,
     }:
     runCommand "${name}-k2pdfopt.patch" { inherit src; } ''
-      source $stdenv/setup
       unpackPhase
 
       orig=$sourceRoot

pkgs/by-name/wt/wtk/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 mkdir unzipped
 pushd unzipped
 unzip $src || true

pkgs/by-name/xo/xorg_sys_opengl/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 mkdir -p $out/lib
 
 ln -s /usr/lib/libGL.so.1 $out/lib/

pkgs/by-name/xq/xquartz/system-fonts.nix

@@ -6,8 +6,6 @@ stdenv.mkDerivation {
     xorg.mkfontdir xorg.mkfontscale
   ];
   buildCommand = ''
-    source $stdenv/setup
-
     for i in ${toString fontDirs} ; do
       if [ -d $i/ ]; then
         list="$list $i";

pkgs/by-name/ya/yandex-disk/package.nix

@@ -28,7 +28,6 @@ stdenv.mkDerivation rec {
   };
 
   builder = writeText "builder.sh" ''
-    . $stdenv/setup
     mkdir -pv $out/bin
     mkdir -pv $out/share
     mkdir -pv $out/etc

pkgs/development/bower-modules/generic/default.nix

@@ -18,8 +18,6 @@ in pkgs.stdenv.mkDerivation (
     inherit bowerPackages;
 
     builder = builtins.toFile "builder.sh" ''
-      source $stdenv/setup
-
       # The project's bower.json is required
       cp $src/bower.json .
 

pkgs/development/compilers/chicken/4/fetchegg/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 echo "exporting egg ${eggName} (version $version) into $out"
 
 mkdir -p $out

pkgs/development/compilers/fpc/binary-builder-darwin.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 pkgdir=$(pwd)/pkg
 deploydir=$(pwd)/deploy
 

pkgs/development/compilers/fpc/binary-builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 tar xf $src
 cd */
 tarballdir=$(pwd)

pkgs/development/compilers/fpc/remove-signature.sh

@@ -1,3 +1 @@
-source $stdenv/setup
-
 codesign_allocate -r -i "$1" -o "$1"

pkgs/development/compilers/ios-cross-compile/9.2_builder.sh

@@ -1,6 +1,4 @@
 # -*- shell-script -*-
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
 
 function extract
 {

pkgs/development/libraries/glibc/locales-builder.sh

@@ -1,9 +1,6 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
 # Glibc cannot have itself in its RPATH.
 export NIX_NO_SELF_RPATH=1
 
-source $stdenv/setup
-
 postConfigure() {
     # Hack: get rid of the `-static' flag set by the bootstrap stdenv.
     # This has to be done *after* `configure' because it builds some

pkgs/development/libraries/gtk-sharp/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 genericBuild
 
 # !!! hack

pkgs/development/perl-modules/generic/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 PERL5LIB="$PERL5LIB${PERL5LIB:+:}$out/lib/perl5/site_perl"
 
 perlFlags=