commit ac825aaea5f4092b652d56694b3dfba696d7736c · pyrox.dev/nixpkgs

+1 -1

doc/release-notes/rl-2505.section.md

···

       112
       112
        
       

     

       113
       113
        
       - All support for 32‐bit Darwin systems has been dropped.

     

       114
       114
        
       

     

       115
       115
       -
       - `substituteAll` has been deprecated in favor of `replaceVars` and will be removed in the next release.

     

       115
       115
       +
       - `substituteAll` and `substituteAllFiles` have been deprecated in favor of `replaceVars` and will be removed in the next release.

     

       116
       116
        
       

     

       117
       117
        
       - Default ICU version updated from 74 to 76

     

       118
       118

+25 -20

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

···

       2
       2
        
       

     

       3
       3
        
       args:

     

       4
       4
        
       

     

       5
       5
       -
       stdenv.mkDerivation (

     

       6
       6
       -
         {

     

       7
       7
       -
           name = if args ? name then args.name else baseNameOf (toString args.src);

     

       8
       8
       -
           builder = builtins.toFile "builder.sh" ''

     

       9
       9
       -
             set -o pipefail

     

       5
       5
       +
       # TODO(@wolfgangwalther): Remove substituteAllFiles after 25.05 branch-off.

     

       6
       6
       +
       lib.warn

     

       7
       7
       +
         "substituteAllFiles is deprecated and will be removed in 25.11. Use replaceVars for each file instead."

     

       8
       8
       +
         (

     

       9
       9
       +
           stdenv.mkDerivation (

     

       10
       10
       +
             {

     

       11
       11
       +
               name = if args ? name then args.name else baseNameOf (toString args.src);

     

       12
       12
       +
               builder = builtins.toFile "builder.sh" ''

     

       13
       13
       +
                 set -o pipefail

     

       10
       14
        
       

     

       11
       11
       -
             eval "$preInstall"

     

       15
       15
       +
                 eval "$preInstall"

     

       12
       16
        
       

     

       13
       13
       -
             args=

     

       17
       17
       +
                 args=

     

       14
       18
        
       

     

       15
       15
       -
             pushd "$src"

     

       16
       16
       -
             echo -ne "${lib.concatStringsSep "\\0" args.files}" | xargs -0 -n1 -I {} -- find {} -type f -print0 | while read -d "" line; do

     

       17
       17
       -
               mkdir -p "$out/$(dirname "$line")"

     

       18
       18
       -
               substituteAll "$line" "$out/$line"

     

       19
       19
       -
             done

     

       20
       20
       -
             popd

     

       19
       19
       +
                 pushd "$src"

     

       20
       20
       +
                 echo -ne "${lib.concatStringsSep "\\0" args.files}" | xargs -0 -n1 -I {} -- find {} -type f -print0 | while read -d "" line; do

     

       21
       21
       +
                   mkdir -p "$out/$(dirname "$line")"

     

       22
       22
       +
                   substituteAll "$line" "$out/$line"

     

       23
       23
       +
                 done

     

       24
       24
       +
                 popd

     

       21
       25
        
       

     

       22
       22
       -
             eval "$postInstall"

     

       23
       23
       -
           '';

     

       24
       24
       -
           preferLocalBuild = true;

     

       25
       25
       -
           allowSubstitutes = false;

     

       26
       26
       -
         }

     

       27
       27
       -
         // args

     

       28
       28
       -
       )

     

       26
       26
       +
                 eval "$postInstall"

     

       27
       27
       +
               '';

     

       28
       28
       +
               preferLocalBuild = true;

     

       29
       29
       +
               allowSubstitutes = false;

     

       30
       30
       +
             }

     

       31
       31
       +
             // args

     

       32
       32
       +
           )

     

       33
       33
       +
         )