commit bf5cc63b6c2e73e42bb244aba95f95d3591839f2 · pyrox.dev/nixpkgs

+4 -6

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

···

       51
       51
        
               isScript "$f" || continue

     

       52
       52
        
       

     

       53
       53
        
               read -r oldInterpreterLine < "$f"

     

       54
       54
       -
               read -r oldPath arg0 args <<< "${oldInterpreterLine:3}"

     

       54
       54
       +
               read -r oldPath arg0 args <<< "${oldInterpreterLine:2}"

     

       55
       55
        
       

     

       56
       56
        
               if [[ -z "$pathName" ]]; then

     

       57
       57
        
                   if [[ -n $strictDeps && $f == "$NIX_STORE"* ]]; then

     
···

       88
       88
        
               newInterpreterLine=${newInterpreterLine%${newInterpreterLine##*[![:space:]]}}

     

       89
       89
        
       

     

       90
       90
        
               if [[ -n "$oldPath" && "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE" ]]; then

     

       91
       91
       -
                   if [[ -n "$newPath" ]] && [[ "$newPath" != "$oldPath" ]]; then

     

       91
       91
       +
                   if [[ -n "$newPath" && "$newPath" != "$oldPath" ]]; then

     

       92
       92
        
                       echo "$f: interpreter directive changed from \"$oldInterpreterLine\" to \"$newInterpreterLine\""

     

       93
       93
        
                       # escape the escape chars so that sed doesn't interpret them

     

       94
       94
        
                       escapedInterpreterLine=${newInterpreterLine//\\/\\\\}

     

       95
       95
        
       

     

       96
       96
        
                       # Preserve times, see: https://github.com/NixOS/nixpkgs/pull/33281

     

       97
       97
       -
                       timestamp=$(mktemp)

     

       98
       98
       -
                       touch -r "$f" "$timestamp"

     

       97
       97
       +
                       timestamp=$(stat --printf "%y" "$f")

     

       99
       98
        
                       sed -i -e "1 s|.*|#\!$escapedInterpreterLine|" "$f"

     

       100
       100
       -
                       touch -r "$timestamp" "$f"

     

       101
       101
       -
                       rm "$timestamp"

     

       99
       99
       +
                       touch --date "$timestamp" "$f"

     

       102
       100
        
                   fi

     

       103
       101
        
               fi

     

       104
       102
        
           done < <(find "$@" -type f -perm -0100 -print0)

+60 -16

pkgs/test/patch-shebangs/default.nix

···

       1
       1
        
       { lib, stdenv, runCommand }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         bad-shebang = stdenv.mkDerivation {

     

       5
       5
       -
           name         = "bad-shebang";

     

       6
       6
       -
           dontUnpack = true;

     

       7
       7
       -
           installPhase = ''

     

       8
       8
       -
             mkdir -p $out/bin

     

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

     

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

     

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

     

       12
       12
       -
           '';

     

       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
       +
           };

     

       13
       32
        
         };

     

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

     

       15
       15
       -
         passthru = { inherit bad-shebang; };

     

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

     

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

     

       17
       36
        
       } ''

     

       18
       18
       -
         printf "checking whether patchShebangs works properly... ">&2

     

       19
       19
       -
         if ! grep -q '^#!/bin/sh' ${bad-shebang}/bin/test; then

     

       20
       20
       -
           echo "yes" >&2

     

       21
       21
       -
           touch $out

     

       22
       22
       -
         else

     

       23
       23
       -
           echo "no" >&2

     

       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"

     

       24
       65
        
           exit 1

     

       66
       66
       +
         else

     

       67
       67
       +
           echo "succeeded"

     

       68
       68
       +
           touch $out

     

       25
       69
        
         fi

     

       26
       70
        
       ''