commit 76844dfcfd7425f54ca5f77a5379d71a685607e1 · pyrox.dev/nixpkgs

+10 -4

pkgs/build-support/setup-hooks/patch-shebangs.sh

···

       62
       62
        
               fi

     

       63
       63
        
       

     

       64
       64
        
               if [[ "$oldPath" == *"/bin/env" ]]; then

     

       65
       65
       +
                   if [[ $arg0 == "-S" ]]; then

     

       66
       66
       +
                       arg0=${args%% *}

     

       67
       67
       +
                       args=${args#* }

     

       68
       68
       +
                       newPath="$(PATH="${!pathName}" command -v "env" || true)"

     

       69
       69
       +
                       args="-S $(PATH="${!pathName}" command -v "$arg0" || true) $args"

     

       70
       70
       +
       

     

       65
       71
        
                   # Check for unsupported 'env' functionality:

     

       66
       66
       -
                   # - options: something starting with a '-'

     

       72
       72
       +
                   # - options: something starting with a '-' besides '-S'

     

       67
       73
        
                   # - environment variables: foo=bar

     

       68
       68
       -
                   if [[ $arg0 == "-"* || $arg0 == *"="* ]]; then

     

       74
       74
       +
                   elif [[ $arg0 == "-"* || $arg0 == *"="* ]]; then

     

       69
       75
        
                       echo "$f: unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)" >&2

     

       70
       76
        
                       exit 1

     

       77
       77
       +
                   else

     

       78
       78
       +
                       newPath="$(PATH="${!pathName}" command -v "$arg0" || true)"

     

       71
       79
        
                   fi

     

       72
       72
       -
       

     

       73
       73
       -
                   newPath="$(PATH="${!pathName}" command -v "$arg0" || true)"

     

       74
       80
        
               else

     

       75
       81
        
                   if [[ -z $oldPath ]]; then

     

       76
       82
        
                       # If no interpreter is specified linux will use /bin/sh. Set

-2

pkgs/test/default.nix

···

       63
       63
        
       

     

       64
       64
        
         overriding = callPackage ./overriding.nix { };

     

       65
       65
        
       

     

       66
       66
       -
         patch-shebangs = callPackage ./patch-shebangs {};

     

       67
       67
       -
       

     

       68
       66
        
         texlive = callPackage ./texlive {};

     

       69
       67
        
       

     

       70
       68
        
         cuda = callPackage ./cuda { };

-70

pkgs/test/patch-shebangs/default.nix

···

       1
       1
       -
       { lib, stdenv, runCommand }:

     

       2
       2
       -
       

     

       3
       3
       -
       let

     

       4
       4
       -
         tests = {

     

       5
       5
       -
           bad-shebang = stdenv.mkDerivation {

     

       6
       6
       -
             name         = "bad-shebang";

     

       7
       7
       -
             dontUnpack = true;

     

       8
       8
       -
             installPhase = ''

     

       9
       9
       -
               mkdir -p $out/bin

     

       10
       10
       -
               echo "#!/bin/sh" > $out/bin/test

     

       11
       11
       -
               echo "echo -n hello" >> $out/bin/test

     

       12
       12
       -
               chmod +x $out/bin/test

     

       13
       13
       -
             '';

     

       14
       14
       -
             passthru = {

     

       15
       15
       -
               assertion = "grep -v '^#!/bin/sh' $out/bin/test > /dev/null";

     

       16
       16
       -
             };

     

       17
       17
       -
           };

     

       18
       18
       -
       

     

       19
       19
       -
           ignores-nix-store = stdenv.mkDerivation {

     

       20
       20
       -
             name = "ignores-nix-store";

     

       21
       21
       -
             dontUnpack = true;

     

       22
       22
       -
             installPhase = ''

     

       23
       23
       -
               mkdir -p $out/bin

     

       24
       24
       -
               echo "#!$NIX_STORE/path/to/sh" > $out/bin/test

     

       25
       25
       -
               echo "echo -n hello" >> $out/bin/test

     

       26
       26
       -
               chmod +x $out/bin/test

     

       27
       27
       -
             '';

     

       28
       28
       -
             passthru = {

     

       29
       29
       -
               assertion = "grep \"^#!$NIX_STORE/path/to/sh\" $out/bin/test > /dev/null";

     

       30
       30
       -
             };

     

       31
       31
       -
           };

     

       32
       32
       -
         };

     

       33
       33
       -
       in runCommand "patch-shebangs-test" {

     

       34
       34
       -
         passthru = { inherit (tests) bad-shebang ignores-nix-store; };

     

       35
       35
       -
         meta.platforms = lib.platforms.all;

     

       36
       36
       -
       } ''

     

       37
       37
       -
         validate() {

     

       38
       38
       -
           local name=$1

     

       39
       39
       -
           local testout=$2

     

       40
       40
       -
           local assertion=$3

     

       41
       41
       -
       

     

       42
       42
       -
           echo -n "... $name: " >&2

     

       43
       43
       -
       

     

       44
       44
       -
           local rc=0

     

       45
       45
       -
           (out=$testout eval "$assertion") || rc=1

     

       46
       46
       -
       

     

       47
       47
       -
           if [ "$rc" -eq 0 ]; then

     

       48
       48
       -
             echo "yes" >&2

     

       49
       49
       -
           else

     

       50
       50
       -
             echo "no" >&2

     

       51
       51
       -
           fi

     

       52
       52
       -
       

     

       53
       53
       -
           return "$rc"

     

       54
       54
       -
         }

     

       55
       55
       -
       

     

       56
       56
       -
         echo "checking whether patchShebangs works properly... ">&2

     

       57
       57
       -
       

     

       58
       58
       -
         fail=

     

       59
       59
       -
         ${lib.concatStringsSep "\n" (lib.mapAttrsToList (_: test: ''

     

       60
       60
       -
           validate "${test.name}" "${test}" ${lib.escapeShellArg test.assertion} || fail=1

     

       61
       61
       -
         '') tests)}

     

       62
       62
       -
       

     

       63
       63
       -
         if [ "$fail" ]; then

     

       64
       64
       -
           echo "failed"

     

       65
       65
       -
           exit 1

     

       66
       66
       -
         else

     

       67
       67
       -
           echo "succeeded"

     

       68
       68
       -
           touch $out

     

       69
       69
       -
         fi

     

       70
       70
       -
       ''

+2 -2

pkgs/test/stdenv/default.nix

···

       98
       98
        
       

     

       99
       99
        
       {

     

       100
       100
        
         # tests for hooks in `stdenv.defaultNativeBuildInputs`

     

       101
       101
       -
         hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenv; pkgs = earlyPkgs; });

     

       101
       101
       +
         hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenv; pkgs = earlyPkgs; inherit lib; });

     

       102
       102
        
       

     

       103
       103
        
         outputs-no-out = runCommand "outputs-no-out-assert" {

     

       104
       104
        
           result = testers.testBuildFailure (stdenv.mkDerivation {

     
···

       158
       158
        
       

     

       159
       159
        
         structuredAttrsByDefault = lib.recurseIntoAttrs {

     

       160
       160
        
       

     

       161
       161
       -
           hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenvStructuredAttrsByDefault; pkgs = earlyPkgs; });

     

       161
       161
       +
           hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenvStructuredAttrsByDefault; pkgs = earlyPkgs; inherit lib; });

     

       162
       162
        
       

     

       163
       163
        
           test-cc-wrapper-substitutions = ccWrapperSubstitutionsTest {

     

       164
       164
        
             name = "test-cc-wrapper-substitutions-structuredAttrsByDefault";

+2 -2

pkgs/test/stdenv/hooks.nix

···

       1
       1
       -
       { stdenv, pkgs }:

     

       1
       1
       +
       { stdenv, pkgs, lib }:

     

       2
       2
        
       

     

       3
       3
        
       # ordering should match defaultNativeBuildInputs

     

       4
       4
        
       

     
···

       91
       91
        
           '';

     

       92
       92
        
         };

     

       93
       93
        
         # TODO: add multiple-outputs

     

       94
       94
       -
         # TODO: move patch-shebangs test from pkgs/test/patch-shebangs/default.nix to here

     

       94
       94
       +
         patch-shebangs = import ./patch-shebangs.nix { inherit stdenv lib pkgs; };

     

       95
       95
        
         prune-libtool-files =

     

       96
       96
        
           let

     

       97
       97
        
             libFoo = pkgs.writeText "libFoo" ''

+98

pkgs/test/stdenv/patch-shebangs.nix

···

       1
       1
       +
       { lib, stdenv, pkgs }:

     

       2
       2
       +
       

     

       3
       3
       +
       # since the tests are using a early stdenv, the stdenv will have dontPatchShebangs=1, so it has to be unset

     

       4
       4
       +
       # https://github.com/NixOS/nixpkgs/blob/768a982bfc9d29a6bd3beb963ed4b054451ce3d0/pkgs/stdenv/linux/default.nix#L148-L153

     

       5
       5
       +
       

     

       6
       6
       +
       # strictDeps has to be disabled because the shell isn't in buildInputs

     

       7
       7
       +
       

     

       8
       8
       +
       let

     

       9
       9
       +
         tests = {

     

       10
       10
       +
           bad-shebang = stdenv.mkDerivation {

     

       11
       11
       +
             name = "bad-shebang";

     

       12
       12
       +
             strictDeps = false;

     

       13
       13
       +
             dontUnpack = true;

     

       14
       14
       +
             installPhase = ''

     

       15
       15
       +
               mkdir -p $out/bin

     

       16
       16
       +
               echo "#!/bin/bash" > $out/bin/test

     

       17
       17
       +
               echo "echo -n hello" >> $out/bin/test

     

       18
       18
       +
               chmod +x $out/bin/test

     

       19
       19
       +
               dontPatchShebangs=

     

       20
       20
       +
             '';

     

       21
       21
       +
             passthru = {

     

       22
       22
       +
               assertion = "grep '^#!${stdenv.shell}' $out/bin/test > /dev/null";

     

       23
       23
       +
             };

     

       24
       24
       +
           };

     

       25
       25
       +
       

     

       26
       26
       +
           ignores-nix-store = stdenv.mkDerivation {

     

       27
       27
       +
             name = "ignores-nix-store";

     

       28
       28
       +
             strictDeps = false;

     

       29
       29
       +
             dontUnpack = true;

     

       30
       30
       +
             installPhase = ''

     

       31
       31
       +
               mkdir -p $out/bin

     

       32
       32
       +
               echo "#!$NIX_STORE/path/to/bash" > $out/bin/test

     

       33
       33
       +
               echo "echo -n hello" >> $out/bin/test

     

       34
       34
       +
               chmod +x $out/bin/test

     

       35
       35
       +
               dontPatchShebangs=

     

       36
       36
       +
             '';

     

       37
       37
       +
             passthru = {

     

       38
       38
       +
               assertion = "grep \"^#!$NIX_STORE/path/to/bash\" $out/bin/test > /dev/null";

     

       39
       39
       +
             };

     

       40
       40
       +
           };

     

       41
       41
       +
       

     

       42
       42
       +
           split-string = stdenv.mkDerivation {

     

       43
       43
       +
             name = "split-string";

     

       44
       44
       +
             strictDeps = false;

     

       45
       45
       +
             dontUnpack = true;

     

       46
       46
       +
             installPhase = ''

     

       47
       47
       +
               mkdir -p $out/bin

     

       48
       48
       +
               echo "#!/usr/bin/env -S bash --posix" > $out/bin/test

     

       49
       49
       +
               echo "echo -n hello" >> $out/bin/test

     

       50
       50
       +
               chmod +x $out/bin/test

     

       51
       51
       +
               dontPatchShebangs=

     

       52
       52
       +
             '';

     

       53
       53
       +
             passthru = {

     

       54
       54
       +
               assertion = "grep -v '^#!${pkgs.coreutils}/bin/env -S ${stdenv.shell} --posix' $out/bin/test > /dev/null";

     

       55
       55
       +
             };

     

       56
       56
       +
           };

     

       57
       57
       +
       

     

       58
       58
       +
         };

     

       59
       59
       +
       in

     

       60
       60
       +
       stdenv.mkDerivation {

     

       61
       61
       +
         name = "test-patch-shebangs";

     

       62
       62
       +
         passthru = { inherit (tests) bad-shebang ignores-nix-store split-string; };

     

       63
       63
       +
         buildCommand = ''

     

       64
       64
       +
           validate() {

     

       65
       65
       +
             local name=$1

     

       66
       66
       +
             local testout=$2

     

       67
       67
       +
             local assertion=$3

     

       68
       68
       +
       

     

       69
       69
       +
             echo -n "... $name: " >&2

     

       70
       70
       +
       

     

       71
       71
       +
             local rc=0

     

       72
       72
       +
             (out=$testout eval "$assertion") || rc=1

     

       73
       73
       +
       

     

       74
       74
       +
             if [ "$rc" -eq 0 ]; then

     

       75
       75
       +
               echo "yes" >&2

     

       76
       76
       +
             else

     

       77
       77
       +
               echo "no" >&2

     

       78
       78
       +
             fi

     

       79
       79
       +
       

     

       80
       80
       +
             return "$rc"

     

       81
       81
       +
           }

     

       82
       82
       +
       

     

       83
       83
       +
           echo "checking whether patchShebangs works properly... ">&2

     

       84
       84
       +
       

     

       85
       85
       +
           fail=

     

       86
       86
       +
           ${lib.concatStringsSep "\n" (lib.mapAttrsToList (_: test: ''

     

       87
       87
       +
             validate "${test.name}" "${test}" ${lib.escapeShellArg test.assertion} || fail=1

     

       88
       88
       +
           '') tests)}

     

       89
       89
       +
       

     

       90
       90
       +
           if [ "$fail" ]; then

     

       91
       91
       +
             echo "failed"

     

       92
       92
       +
             exit 1

     

       93
       93
       +
           else

     

       94
       94
       +
             echo "succeeded"

     

       95
       95
       +
             touch $out

     

       96
       96
       +
           fi

     

       97
       97
       +
         '';

     

       98
       98
       +
       }

+3 -3

pkgs/top-level/release.nix

···

       82
       82
        
                     jobs.tests.cc-wrapper-libcxx.x86_64-darwin

     

       83
       83
        
                     jobs.tests.stdenv-inputs.x86_64-darwin

     

       84
       84
        
                     jobs.tests.macOSSierraShared.x86_64-darwin

     

       85
       85
       -
                     jobs.tests.patch-shebangs.x86_64-darwin

     

       85
       85
       +
                     jobs.tests.stdenv.hooks.patch-shebangs.x86_64-darwin

     

       86
       86
        
                     */

     

       87
       87
        
                   ];

     

       88
       88
        
               } else null;

     
···

       127
       127
        
                     jobs.tests.cc-multilib-gcc.x86_64-linux

     

       128
       128
        
                     jobs.tests.cc-multilib-clang.x86_64-linux

     

       129
       129
        
                     jobs.tests.stdenv-inputs.x86_64-linux

     

       130
       130
       -
                     jobs.tests.patch-shebangs.x86_64-linux

     

       130
       130
       +
                     jobs.tests.stdenv.hooks.patch-shebangs.x86_64-linux

     

       131
       131
        
                     */

     

       132
       132
        
                   ]

     

       133
       133
        
                   # FIXME: reintroduce aarch64-darwin after this builds again

     
···

       158
       158
        
                     jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin

     

       159
       159
        
                     jobs.tests.stdenv-inputs.x86_64-darwin

     

       160
       160
        
                     jobs.tests.macOSSierraShared.x86_64-darwin

     

       161
       161
       -
                     jobs.tests.patch-shebangs.x86_64-darwin

     

       161
       161
       +
                     jobs.tests.stdenv.hooks.patch-shebangs.x86_64-darwin

     

       162
       162
        
                     */

     

       163
       163
        
                   ];

     

       164
       164
        
               };