commit 2e43b87c62a2c2f179293ec3645a3688fc1e34a0 · pyrox.dev/nixpkgs

+5 -7

pkgs/build-support/replace-vars/replace-vars-with.nix

···

       58
        
       

     

       59
        
       let

     

       60
        
         # We use `--replace-fail` instead of `--subst-var-by` so that if the thing isn't there, we fail.

     

       61
       -
         subst-var-by =

     

       62
       -
           name: value:

     

       63
       -
           lib.optionals (value != null) [

     

       64
       -
             "--replace-fail"

     

       65
       -
             (lib.escapeShellArg "@${name}@")

     

       66
       -
             (lib.escapeShellArg value)

     

       67
       -
           ];

     

       68
        
       

     

       69
        
         substitutions = lib.concatLists (lib.mapAttrsToList subst-var-by replacements);

     

       70

···

       58
        
       

     

       59
        
       let

     

       60
        
         # We use `--replace-fail` instead of `--subst-var-by` so that if the thing isn't there, we fail.

     

       61
       +
         subst-var-by = name: value: [

     

       62
       +
           "--replace-fail"

     

       63
       +
           (lib.escapeShellArg "@${name}@")

     

       64
       +
           (lib.escapeShellArg (lib.defaultTo "@${name}@" value))

     

       65
       +
         ];

     

       0
        
       
     

       0
        
       
     

       66
        
       

     

       67
        
         substitutions = lib.concatLists (lib.mapAttrsToList subst-var-by replacements);

     

       68

+7 -11

pkgs/stdenv/generic/setup.sh

···

       1042
        
                       pattern="$2"

     

       1043
        
                       replacement="$3"

     

       1044
        
                       shift 3

     

       1045
       -
                       local savedvar

     

       1046
       -
                       savedvar="${!var}"

     

       1047
       -
                       eval "$var"'=${'"$var"'//"$pattern"/"$replacement"}'

     

       1048
       -
                       if [ "$pattern" != "$replacement" ]; then

     

       1049
       -
                           if [ "${!var}" == "$savedvar" ]; then

     

       1050
       -
                               if [ "$replace_mode" == --replace-warn ]; then

     

       1051
       -
                                   printf "substituteStream() in derivation $name: WARNING: pattern %q doesn't match anything in %s\n" "$pattern" "$description" >&2

     

       1052
       -
                               elif [ "$replace_mode" == --replace-fail ]; then

     

       1053
       -
                                   printf "substituteStream() in derivation $name: ERROR: pattern %q doesn't match anything in %s\n" "$pattern" "$description" >&2

     

       1054
       -
                                   return 1

     

       1055
       -
                               fi

     

       1056
        
                           fi

     

       1057
        
                       fi

     

       0
        
       
     

       1058
        
                       ;;

     

       1059
        
       

     

       1060
        
                   --subst-var)

···

       1042
        
                       pattern="$2"

     

       1043
        
                       replacement="$3"

     

       1044
        
                       shift 3

     

       1045
       +
                       if ! [[ "${!var}" == *"$pattern"* ]]; then

     

       1046
       +
                           if [ "$replace_mode" == --replace-warn ]; then

     

       1047
       +
                               printf "substituteStream() in derivation $name: WARNING: pattern %q doesn't match anything in %s\n" "$pattern" "$description" >&2

     

       1048
       +
                           elif [ "$replace_mode" == --replace-fail ]; then

     

       1049
       +
                               printf "substituteStream() in derivation $name: ERROR: pattern %q doesn't match anything in %s\n" "$pattern" "$description" >&2

     

       1050
       +
                               return 1

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1051
        
                           fi

     

       1052
        
                       fi

     

       1053
       +
                       eval "$var"'=${'"$var"'//"$pattern"/"$replacement"}'

     

       1054
        
                       ;;

     

       1055
        
       

     

       1056
        
                   --subst-var)

+24

pkgs/test/replace-vars/default.nix

···

       121
        
       

     

       122
        
                   touch $out

     

       123
        
                 '';

     

       124
       +
       

     

       125
       +
             fails-in-check-phase-with-bad-exemption =

     

       126
       +
               runCommand "replaceVars-fails"

     

       127
       +
                 {

     

       128
       +
                   failed =

     

       129
       +
                     let

     

       130
       +
                       src = builtins.toFile "source.txt" ''

     

       131
       +
                         @a@

     

       132
       +
                         @b@

     

       133
       +
                       '';

     

       134
       +
                     in

     

       135
       +
                     testBuildFailure (

     

       136
       +
                       callReplaceVars src {

     

       137
       +
                         a = "a";

     

       138
       +
                         b = null;

     

       139
       +
                         c = null;

     

       140
       +
                       }

     

       141
       +
                     );

     

       142
       +
                 }

     

       143
       +
                 ''

     

       144
       +
                   grep -e "ERROR: pattern @c@ doesn't match anything in file.*source.txt" $failed/testBuildFailure.log

     

       145
       +
       

     

       146
       +
                   touch $out

     

       147
       +
                 '';

     

       148
        
           };

     

       149
        
       in

     

       150
        
       {