commit 70b4b9383f2c5018b4e796524cbbd7a049b170bb · pyrox.dev/nixpkgs

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

···

       8
       8
        
       

     

       9
       9
        
       - `services.rippleDataApi` has been removed, as `ripple-data-api` was broken and had not been updated since 2022.

     

       10
       10
        
       

     

       11
       11
       +
       - `apptainer` and `singularity` deprecate the workaround of overriding `vendorHash` and related attributes via `<pkg>.override`,

     

       12
       12
       +
         in favour of the unified overriding of the same group of attributes via `<pkg>.overrideAttrs`.

     

       13
       13
       +
         The compatibility layer will be removed in future releases.

     

       14
       14
       +
       

     

       11
       15
        
       - `squid` has been updated to version 7, this release includes multiple breaking changes, like ESI removal.

     

       12
       16
        
         For more information, [check the release notes](https://github.com/squid-cache/squid/releases/tag/SQUID_7_0_1).

     

       13
       17

+21 -6

pkgs/applications/virtualization/singularity/generic.nix

···

       16
       16
        
       let

     

       17
       17
        
         # Backward compatibility layer for the obsolete workaround of

     

       18
       18
        
         # the "vendor-related attributes not overridable" issue (#86349),

     

       19
       19
       -
         # whose solution is merged and released.

     

       19
       19
       +
         # whose solution (#225051) is merged and released.

     

       20
       20
       +
         # TODO(@ShamrockLee): Remove after the Nixpkgs 25.05 branch-off.

     

       20
       21
        
         _defaultGoVendorArgs = {

     

       21
       22
        
           inherit vendorHash deleteVendor proxyVendor;

     

       22
       23
        
         };

     
···

       96
       97
        
         #   "path/to/source/file1" = [ "<originalDefaultPath11>" "<originalDefaultPath12>" ... ];

     

       97
       98
        
         # }

     

       98
       99
        
         sourceFilesWithDefaultPaths ? { },

     

       99
       99
       -
         # Workaround #86349

     

       100
       100
       -
         # should be removed when the issue is resolved

     

       101
       101
       -
         vendorHash ? _defaultGoVendorArgs.vendorHash,

     

       102
       102
       -
         deleteVendor ? _defaultGoVendorArgs.deleteVendor,

     

       103
       103
       -
         proxyVendor ? _defaultGoVendorArgs.proxyVendor,

     

       100
       100
       +
         # Placeholders for the obsolete workaround of #86349

     

       101
       101
       +
         # TODO(@ShamrockLee): Remove after the Nixpkgs 25.05 branch-off.

     

       102
       102
       +
         vendorHash ? null,

     

       103
       103
       +
         deleteVendor ? null,

     

       104
       104
       +
         proxyVendor ? null,

     

       104
       105
        
       }@args:

     

       105
       106
        
       

     

       106
       107
        
       let

     

       108
       108
       +
         # Backward compatibility layer for the obsolete workaround of #86349

     

       109
       109
       +
         # TODO(@ShamrockLee): Convert to simple inheritance after the Nixpkgs 25.05 branch-off.

     

       110
       110
       +
         moduleArgsOverridingCompat =

     

       111
       111
       +
           argName:

     

       112
       112
       +
           if args.${argName} or null == null then

     

       113
       113
       +
             _defaultGoVendorArgs.${argName}

     

       114
       114
       +
           else

     

       115
       115
       +
             lib.warn

     

       116
       116
       +
               "${projectName}: Override ${argName} with .override is deprecated. Use .overrideAttrs instead."

     

       117
       117
       +
               args.${argName};

     

       118
       118
       +
         vendorHash = moduleArgsOverridingCompat "vendorHash";

     

       119
       119
       +
         deleteVendor = moduleArgsOverridingCompat "deleteVendor";

     

       120
       120
       +
         proxyVendor = moduleArgsOverridingCompat "proxyVendor";

     

       121
       121
       +
       

     

       107
       122
        
         addShellDoubleQuotes = s: lib.escapeShellArg ''"'' + s + lib.escapeShellArg ''"'';

     

       108
       123
        
       in

     

       109
       124
        
       (buildGoModule {