commit 4eb66675aaba7845db9e9a8b703467e17095e8a7 · pyrox.dev/nixpkgs

+1 -1

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

···

       3
       3
        
       ## Highlights {#sec-nixpkgs-release-25.11-highlights}

     

       4
       4
        
       <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

     

       5
       5
        
       

     

       6
       6
       -
       - Create the first release note entry in this section!

     

       6
       6
       +
       - Added `allowVariants` to gate availability of package sets like `pkgsLLVM`, `pkgsMusl`, `pkgsZig`, etc.

     

       7
       7
        
       

     

       8
       8
        
       ## Backward Incompatibilities {#sec-nixpkgs-release-25.11-incompatibilities}

     

       9
       9

+12

pkgs/top-level/config.nix

···

       137
       137
        
             '';

     

       138
       138
        
           };

     

       139
       139
        
       

     

       140
       140
       +
           allowVariants = mkOption {

     

       141
       141
       +
             type = types.bool;

     

       142
       142
       +
             default = true;

     

       143
       143
       +
             description = ''

     

       144
       144
       +
               Whether to expose the nixpkgs variants.

     

       145
       145
       +
       

     

       146
       146
       +
               Variants are instances of the current nixpkgs instance with different stdenvs or other applied options.

     

       147
       147
       +
               This allows for using different toolchains, libcs, or global build changes across nixpkgs.

     

       148
       148
       +
               Disabling can ensure nixpkgs is only building for the platform which you specified.

     

       149
       149
       +
             '';

     

       150
       150
       +
           };

     

       151
       151
       +
       

     

       140
       152
        
           cudaSupport = mkMassRebuild {

     

       141
       153
        
             type = types.bool;

     

       142
       154
        
             default = false;

+12 -102

pkgs/top-level/stage.nix

···

       191
       191
        
       

     

       192
       192
        
         aliases = self: super: lib.optionalAttrs config.allowAliases (import ./aliases.nix lib self super);

     

       193
       193
        
       

     

       194
       194
       +
         variants = import ./variants.nix {

     

       195
       195
       +
           inherit

     

       196
       196
       +
             lib

     

       197
       197
       +
             nixpkgsFun

     

       198
       198
       +
             stdenv

     

       199
       199
       +
             overlays

     

       200
       200
       +
             makeMuslParsedPlatform

     

       201
       201
       +
             ;

     

       202
       202
       +
         };

     

       203
       203
       +
       

     

       194
       204
        
         # stdenvOverrides is used to avoid having multiple of versions

     

       195
       205
        
         # of certain dependencies that were used in bootstrapping the

     

       196
       206
        
         # standard environment.

     
···

       214
       224
        
         # - pkgsCross.<system> where system is a member of lib.systems.examples

     

       215
       225
        
         # - pkgsMusl

     

       216
       226
        
         # - pkgsi686Linux

     

       227
       227
       +
         # NOTE: add new non-critical package sets to "pkgs/top-level/variants.nix"

     

       217
       228
        
         otherPackageSets = self: super: {

     

       218
       229
        
           # This maps each entry in lib.systems.examples to its own package

     

       219
       230
        
           # set. Each of these will contain all packages cross compiled for

     
···

       222
       233
        
           # Raspberry Pi.

     

       223
       234
        
           pkgsCross = lib.mapAttrs (n: crossSystem: nixpkgsFun { inherit crossSystem; }) lib.systems.examples;

     

       224
       235
        
       

     

       225
       225
       -
           pkgsLLVM = nixpkgsFun {

     

       226
       226
       -
             overlays = [

     

       227
       227
       -
               (self': super': {

     

       228
       228
       -
                 pkgsLLVM = super';

     

       229
       229
       -
               })

     

       230
       230
       -
             ] ++ overlays;

     

       231
       231
       -
             # Bootstrap a cross stdenv using the LLVM toolchain.

     

       232
       232
       -
             # This is currently not possible when compiling natively,

     

       233
       233
       -
             # so we don't need to check hostPlatform != buildPlatform.

     

       234
       234
       -
             crossSystem = stdenv.hostPlatform // {

     

       235
       235
       -
               useLLVM = true;

     

       236
       236
       -
               linker = "lld";

     

       237
       237
       -
             };

     

       238
       238
       -
           };

     

       239
       239
       -
       

     

       240
       240
       -
           pkgsArocc = nixpkgsFun {

     

       241
       241
       -
             overlays = [

     

       242
       242
       -
               (self': super': {

     

       243
       243
       -
                 pkgsArocc = super';

     

       244
       244
       -
               })

     

       245
       245
       -
             ] ++ overlays;

     

       246
       246
       -
             # Bootstrap a cross stdenv using the Aro C compiler.

     

       247
       247
       -
             # This is currently not possible when compiling natively,

     

       248
       248
       -
             # so we don't need to check hostPlatform != buildPlatform.

     

       249
       249
       -
             crossSystem = stdenv.hostPlatform // {

     

       250
       250
       -
               useArocc = true;

     

       251
       251
       -
               linker = "lld";

     

       252
       252
       -
             };

     

       253
       253
       -
           };

     

       254
       254
       -
       

     

       255
       255
       -
           pkgsZig = nixpkgsFun {

     

       256
       256
       -
             overlays = [

     

       257
       257
       -
               (self': super': {

     

       258
       258
       -
                 pkgsZig = super';

     

       259
       259
       -
               })

     

       260
       260
       -
             ] ++ overlays;

     

       261
       261
       -
             # Bootstrap a cross stdenv using the Zig toolchain.

     

       262
       262
       -
             # This is currently not possible when compiling natively,

     

       263
       263
       -
             # so we don't need to check hostPlatform != buildPlatform.

     

       264
       264
       -
             crossSystem = stdenv.hostPlatform // {

     

       265
       265
       -
               useZig = true;

     

       266
       266
       -
               linker = "lld";

     

       267
       267
       -
             };

     

       268
       268
       -
           };

     

       269
       269
       -
       

     

       270
       270
       -
           # All packages built with the Musl libc. This will override the

     

       271
       271
       -
           # default GNU libc on Linux systems. Non-Linux systems are not

     

       272
       272
       -
           # supported. 32-bit is also not supported.

     

       273
       273
       -
           pkgsMusl =

     

       274
       274
       -
             if stdenv.hostPlatform.isLinux && stdenv.buildPlatform.is64bit then

     

       275
       275
       -
               nixpkgsFun {

     

       276
       276
       -
                 overlays = [

     

       277
       277
       -
                   (self': super': {

     

       278
       278
       -
                     pkgsMusl = super';

     

       279
       279
       -
                   })

     

       280
       280
       -
                 ] ++ overlays;

     

       281
       281
       -
                 ${if stdenv.hostPlatform == stdenv.buildPlatform then "localSystem" else "crossSystem"} = {

     

       282
       282
       -
                   config = lib.systems.parse.tripleFromSystem (makeMuslParsedPlatform stdenv.hostPlatform.parsed);

     

       283
       283
       -
                 };

     

       284
       284
       -
               }

     

       285
       285
       -
             else

     

       286
       286
       -
               throw "Musl libc only supports 64-bit Linux systems.";

     

       287
       287
       -
       

     

       288
       236
        
           # All packages built for i686 Linux.

     

       289
       237
        
           # Used by wine, firefox with debugging version of Flash, ...

     

       290
       238
        
           pkgsi686Linux =

     
···

       376
       324
        
                 // stdenv.hostPlatform.gcc or { };

     

       377
       325
        
             };

     

       378
       326
        
           });

     

       379
       379
       -
       

     

       380
       380
       -
           # Full package set with rocm on cuda off

     

       381
       381
       -
           # Mostly useful for asserting pkgs.pkgsRocm.torchWithRocm == pkgs.torchWithRocm and similar

     

       382
       382
       -
           pkgsRocm = nixpkgsFun ({

     

       383
       383
       -
             config = super.config // {

     

       384
       384
       -
               cudaSupport = false;

     

       385
       385
       -
               rocmSupport = true;

     

       386
       386
       -
             };

     

       387
       387
       -
           });

     

       388
       388
       -
       

     

       389
       389
       -
           pkgsExtraHardening = nixpkgsFun {

     

       390
       390
       -
             overlays = [

     

       391
       391
       -
               (

     

       392
       392
       -
                 self': super':

     

       393
       393
       -
                 {

     

       394
       394
       -
                   pkgsExtraHardening = super';

     

       395
       395
       -
                   stdenv = super'.withDefaultHardeningFlags (

     

       396
       396
       -
                     super'.stdenv.cc.defaultHardeningFlags

     

       397
       397
       -
                     ++ [

     

       398
       398
       -
                       "shadowstack"

     

       399
       399
       -
                       "nostrictaliasing"

     

       400
       400
       -
                       "pacret"

     

       401
       401
       -
                       "trivialautovarinit"

     

       402
       402
       -
                     ]

     

       403
       403
       -
                   ) super'.stdenv;

     

       404
       404
       -
                   glibc = super'.glibc.override rec {

     

       405
       405
       -
                     enableCET = if self'.stdenv.hostPlatform.isx86_64 then "permissive" else false;

     

       406
       406
       -
                     enableCETRuntimeDefault = enableCET != false;

     

       407
       407
       -
                   };

     

       408
       408
       -
                 }

     

       409
       409
       -
                 // lib.optionalAttrs (with super'.stdenv.hostPlatform; isx86_64 && isLinux) {

     

       410
       410
       -
                   # causes shadowstack disablement

     

       411
       411
       -
                   pcre = super'.pcre.override { enableJit = false; };

     

       412
       412
       -
                   pcre-cpp = super'.pcre-cpp.override { enableJit = false; };

     

       413
       413
       -
                   pcre16 = super'.pcre16.override { enableJit = false; };

     

       414
       414
       -
                 }

     

       415
       415
       -
               )

     

       416
       416
       -
             ] ++ overlays;

     

       417
       417
       -
           };

     

       418
       327
        
         };

     

       419
       328
        
       

     

       420
       329
        
         # The complete chain of package set builders, applied from top to bottom.

     
···

       430
       339
        
             allPackages

     

       431
       340
        
             otherPackageSets

     

       432
       341
        
             aliases

     

       342
       342
       +
             variants

     

       433
       343
        
             configOverrides

     

       434
       344
        
           ]

     

       435
       345
        
           ++ overlays

+127

pkgs/top-level/variants.nix

···

       1
       1
       +
       /*

     

       2
       2
       +
         This file contains all of the different variants of nixpkgs instances.

     

       3
       3
       +
       

     

       4
       4
       +
         Unlike the other package sets like pkgsCross, pkgsi686Linux, etc., this

     

       5
       5
       +
         contains non-critical package sets. The intent is to be a shorthand

     

       6
       6
       +
         for things like using different toolchains in every package in nixpkgs.

     

       7
       7
       +
       */

     

       8
       8
       +
       {

     

       9
       9
       +
         lib,

     

       10
       10
       +
         stdenv,

     

       11
       11
       +
         nixpkgsFun,

     

       12
       12
       +
         overlays,

     

       13
       13
       +
         makeMuslParsedPlatform,

     

       14
       14
       +
       }:

     

       15
       15
       +
       let

     

       16
       16
       +
         makeLLVMParsedPlatform =

     

       17
       17
       +
           parsed:

     

       18
       18
       +
           (

     

       19
       19
       +
             parsed

     

       20
       20
       +
             // {

     

       21
       21
       +
               abi = lib.systems.parse.abis.llvm;

     

       22
       22
       +
             }

     

       23
       23
       +
           );

     

       24
       24
       +
       in

     

       25
       25
       +
       self: super: {

     

       26
       26
       +
         pkgsLLVM = nixpkgsFun {

     

       27
       27
       +
           overlays = [

     

       28
       28
       +
             (self': super': {

     

       29
       29
       +
               pkgsLLVM = super';

     

       30
       30
       +
             })

     

       31
       31
       +
           ] ++ overlays;

     

       32
       32
       +
           # Bootstrap a cross stdenv using the LLVM toolchain.

     

       33
       33
       +
           # This is currently not possible when compiling natively,

     

       34
       34
       +
           # so we don't need to check hostPlatform != buildPlatform.

     

       35
       35
       +
           crossSystem = stdenv.hostPlatform // {

     

       36
       36
       +
             useLLVM = true;

     

       37
       37
       +
             linker = "lld";

     

       38
       38
       +
           };

     

       39
       39
       +
         };

     

       40
       40
       +
       

     

       41
       41
       +
         pkgsArocc = nixpkgsFun {

     

       42
       42
       +
           overlays = [

     

       43
       43
       +
             (self': super': {

     

       44
       44
       +
               pkgsArocc = super';

     

       45
       45
       +
             })

     

       46
       46
       +
           ] ++ overlays;

     

       47
       47
       +
           # Bootstrap a cross stdenv using the Aro C compiler.

     

       48
       48
       +
           # This is currently not possible when compiling natively,

     

       49
       49
       +
           # so we don't need to check hostPlatform != buildPlatform.

     

       50
       50
       +
           crossSystem = stdenv.hostPlatform // {

     

       51
       51
       +
             useArocc = true;

     

       52
       52
       +
             linker = "lld";

     

       53
       53
       +
           };

     

       54
       54
       +
         };

     

       55
       55
       +
       

     

       56
       56
       +
         pkgsZig = nixpkgsFun {

     

       57
       57
       +
           overlays = [

     

       58
       58
       +
             (self': super': {

     

       59
       59
       +
               pkgsZig = super';

     

       60
       60
       +
             })

     

       61
       61
       +
           ] ++ overlays;

     

       62
       62
       +
           # Bootstrap a cross stdenv using the Zig toolchain.

     

       63
       63
       +
           # This is currently not possible when compiling natively,

     

       64
       64
       +
           # so we don't need to check hostPlatform != buildPlatform.

     

       65
       65
       +
           crossSystem = stdenv.hostPlatform // {

     

       66
       66
       +
             useZig = true;

     

       67
       67
       +
             linker = "lld";

     

       68
       68
       +
           };

     

       69
       69
       +
         };

     

       70
       70
       +
       

     

       71
       71
       +
         # All packages built with the Musl libc. This will override the

     

       72
       72
       +
         # default GNU libc on Linux systems. Non-Linux systems are not

     

       73
       73
       +
         # supported. 32-bit is also not supported.

     

       74
       74
       +
         pkgsMusl =

     

       75
       75
       +
           if stdenv.hostPlatform.isLinux && stdenv.buildPlatform.is64bit then

     

       76
       76
       +
             nixpkgsFun {

     

       77
       77
       +
               overlays = [

     

       78
       78
       +
                 (self': super': {

     

       79
       79
       +
                   pkgsMusl = super';

     

       80
       80
       +
                 })

     

       81
       81
       +
               ] ++ overlays;

     

       82
       82
       +
               ${if stdenv.hostPlatform == stdenv.buildPlatform then "localSystem" else "crossSystem"} = {

     

       83
       83
       +
                 config = lib.systems.parse.tripleFromSystem (makeMuslParsedPlatform stdenv.hostPlatform.parsed);

     

       84
       84
       +
               };

     

       85
       85
       +
             }

     

       86
       86
       +
           else

     

       87
       87
       +
             throw "Musl libc only supports 64-bit Linux systems.";

     

       88
       88
       +
       

     

       89
       89
       +
         # Full package set with rocm on cuda off

     

       90
       90
       +
         # Mostly useful for asserting pkgs.pkgsRocm.torchWithRocm == pkgs.torchWithRocm and similar

     

       91
       91
       +
         pkgsRocm = nixpkgsFun ({

     

       92
       92
       +
           config = super.config // {

     

       93
       93
       +
             cudaSupport = false;

     

       94
       94
       +
             rocmSupport = true;

     

       95
       95
       +
           };

     

       96
       96
       +
         });

     

       97
       97
       +
       

     

       98
       98
       +
         pkgsExtraHardening = nixpkgsFun {

     

       99
       99
       +
           overlays = [

     

       100
       100
       +
             (

     

       101
       101
       +
               self': super':

     

       102
       102
       +
               {

     

       103
       103
       +
                 pkgsExtraHardening = super';

     

       104
       104
       +
                 stdenv = super'.withDefaultHardeningFlags (

     

       105
       105
       +
                   super'.stdenv.cc.defaultHardeningFlags

     

       106
       106
       +
                   ++ [

     

       107
       107
       +
                     "shadowstack"

     

       108
       108
       +
                     "nostrictaliasing"

     

       109
       109
       +
                     "pacret"

     

       110
       110
       +
                     "trivialautovarinit"

     

       111
       111
       +
                   ]

     

       112
       112
       +
                 ) super'.stdenv;

     

       113
       113
       +
                 glibc = super'.glibc.override rec {

     

       114
       114
       +
                   enableCET = if self'.stdenv.hostPlatform.isx86_64 then "permissive" else false;

     

       115
       115
       +
                   enableCETRuntimeDefault = enableCET != false;

     

       116
       116
       +
                 };

     

       117
       117
       +
               }

     

       118
       118
       +
               // lib.optionalAttrs (with super'.stdenv.hostPlatform; isx86_64 && isLinux) {

     

       119
       119
       +
                 # causes shadowstack disablement

     

       120
       120
       +
                 pcre = super'.pcre.override { enableJit = false; };

     

       121
       121
       +
                 pcre-cpp = super'.pcre-cpp.override { enableJit = false; };

     

       122
       122
       +
                 pcre16 = super'.pcre16.override { enableJit = false; };

     

       123
       123
       +
               }

     

       124
       124
       +
             )

     

       125
       125
       +
           ] ++ overlays;

     

       126
       126
       +
         };

     

       127
       127
       +
       }