commit 0acbe87d4f150dec5e262d1adb1336c762c0f725 · pyrox.dev/nixpkgs

+20 -20

nixos/modules/misc/nixpkgs.nix

···

       73
        
         defaultPkgs =

     

       74
        
           if opt.hostPlatform.isDefined then

     

       75
        
             let

     

       76
       -
               isCross = cfg.buildPlatform != cfg.hostPlatform;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       77
        
               systemArgs =

     

       78
        
                 if isCross then

     

       79
        
                   {

     
···

       195
        
           };

     

       196
        
       

     

       197
        
           hostPlatform = lib.mkOption {

     

       198
       -
             type = lib.types.either lib.types.str lib.types.attrs; # TODO utilize lib.systems.parsedPlatform

     

       199
        
             example = {

     

       200
        
               system = "aarch64-linux";

     

       201
        
             };

     

       202
       -
             # Make sure that the final value has all fields for sake of other modules

     

       203
       -
             # referring to this. TODO make `lib.systems` itself use the module system.

     

       204
       -
             apply = lib.systems.elaborate;

     

       205
        
             defaultText = lib.literalExpression ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform'';

     

       206
        
             description = ''

     

       207
        
               Specifies the platform where the NixOS configuration will run.

     
···

       213
        
           };

     

       214
        
       

     

       215
        
           buildPlatform = lib.mkOption {

     

       216
       -
             type = lib.types.either lib.types.str lib.types.attrs; # TODO utilize lib.systems.parsedPlatform

     

       217
        
             default = cfg.hostPlatform;

     

       218
        
             example = {

     

       219
        
               system = "x86_64-linux";

     

       220
        
             };

     

       221
        
             # Make sure that the final value has all fields for sake of other modules

     

       222
        
             # referring to this.

     

       223
       -
             apply =

     

       224
       -
               inputBuildPlatform:

     

       225
       -
               let

     

       226
       -
                 elaborated = lib.systems.elaborate inputBuildPlatform;

     

       227
       -
               in

     

       228
       -
               if lib.systems.equals elaborated cfg.hostPlatform then

     

       229
       -
                 cfg.hostPlatform # make identical, so that `==` equality works; see https://github.com/NixOS/nixpkgs/issues/278001

     

       230
       -
               else

     

       231
       -
                 elaborated;

     

       232
        
             defaultText = lib.literalExpression ''config.nixpkgs.hostPlatform'';

     

       233
        
             description = ''

     

       234
        
               Specifies the platform on which NixOS should be built.

     
···

       245
        
           };

     

       246
        
       

     

       247
        
           localSystem = lib.mkOption {

     

       248
       -
             type = lib.types.attrs; # TODO utilize lib.systems.parsedPlatform

     

       249
        
             default = { inherit (cfg) system; };

     

       250
        
             example = {

     

       251
        
               system = "aarch64-linux";

     

       252
        
             };

     

       253
       -
             # Make sure that the final value has all fields for sake of other modules

     

       254
       -
             # referring to this. TODO make `lib.systems` itself use the module system.

     

       255
       -
             apply = lib.systems.elaborate;

     

       256
        
             defaultText = lib.literalExpression ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform'';

     

       257
        
             description = ''

     

       258
        
               Systems with a recently generated `hardware-configuration.nix`

     
···

       280
        
           #      is a relation between at least 2 systems in the context of a

     

       281
        
           #      specific build step, not a single system.

     

       282
        
           crossSystem = lib.mkOption {

     

       283
       -
             type = lib.types.nullOr lib.types.attrs; # TODO utilize lib.systems.parsedPlatform

     

       284
        
             default = null;

     

       285
        
             example = {

     

       286
        
               system = "aarch64-linux";

     
···

       414
        
       

     

       415
        
                   Defined in:

     

       416
        
                   ${lib.concatMapStringsSep "\n" (file: "  - ${file}") opt.config.files}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       417
        
                 '';

     

       418
        
               }

     

       419
        
             ];

···

       73
        
         defaultPkgs =

     

       74
        
           if opt.hostPlatform.isDefined then

     

       75
        
             let

     

       76
       +
               isCross =

     

       77
       +
                 !(lib.systems.equals (lib.systems.elaborate cfg.buildPlatform) (

     

       78
       +
                   lib.systems.elaborate cfg.hostPlatform

     

       79
       +
                 ));

     

       80
        
               systemArgs =

     

       81
        
                 if isCross then

     

       82
        
                   {

     
···

       198
        
           };

     

       199
        
       

     

       200
        
           hostPlatform = lib.mkOption {

     

       201
       +
             type = lib.types.either lib.types.str lib.types.attrs;

     

       202
        
             example = {

     

       203
        
               system = "aarch64-linux";

     

       204
        
             };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       205
        
             defaultText = lib.literalExpression ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform'';

     

       206
        
             description = ''

     

       207
        
               Specifies the platform where the NixOS configuration will run.

     
···

       213
        
           };

     

       214
        
       

     

       215
        
           buildPlatform = lib.mkOption {

     

       216
       +
             type = lib.types.either lib.types.str lib.types.attrs;

     

       217
        
             default = cfg.hostPlatform;

     

       218
        
             example = {

     

       219
        
               system = "x86_64-linux";

     

       220
        
             };

     

       221
        
             # Make sure that the final value has all fields for sake of other modules

     

       222
        
             # referring to this.

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       223
        
             defaultText = lib.literalExpression ''config.nixpkgs.hostPlatform'';

     

       224
        
             description = ''

     

       225
        
               Specifies the platform on which NixOS should be built.

     
···

       236
        
           };

     

       237
        
       

     

       238
        
           localSystem = lib.mkOption {

     

       239
       +
             type = lib.types.attrs;

     

       240
        
             default = { inherit (cfg) system; };

     

       241
        
             example = {

     

       242
        
               system = "aarch64-linux";

     

       243
        
             };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       244
        
             defaultText = lib.literalExpression ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform'';

     

       245
        
             description = ''

     

       246
        
               Systems with a recently generated `hardware-configuration.nix`

     
···

       268
        
           #      is a relation between at least 2 systems in the context of a

     

       269
        
           #      specific build step, not a single system.

     

       270
        
           crossSystem = lib.mkOption {

     

       271
       +
             type = lib.types.nullOr lib.types.attrs;

     

       272
        
             default = null;

     

       273
        
             example = {

     

       274
        
               system = "aarch64-linux";

     
···

       402
        
       

     

       403
        
                   Defined in:

     

       404
        
                   ${lib.concatMapStringsSep "\n" (file: "  - ${file}") opt.config.files}

     

       405
       +
                 '';

     

       406
       +
               }

     

       407
       +
               {

     

       408
       +
                 assertion =

     

       409
       +
                   (opt.hostPlatform.isDefined -> builtins.isAttrs cfg.buildPlatform -> !(cfg.buildPlatform ? parsed))

     

       410
       +
                   && (opt.hostPlatform.isDefined -> builtins.isAttrs cfg.hostPlatform -> !(cfg.hostPlatform ? parsed))

     

       411
       +
                   && (builtins.isAttrs cfg.localSystem -> !(cfg.localSystem ? parsed))

     

       412
       +
                   && (builtins.isAttrs cfg.crossSystem -> !(cfg.crossSystem ? parsed));

     

       413
       +
                 message = ''

     

       414
       +
                   Passing fully elaborated systems to `nixpkgs.localSystem`, `nixpkgs.crossSystem`, `nixpkgs.buildPlatform`

     

       415
       +
                   or `nixpkgs.hostPlatform` will break composability of package sets in nixpkgs. For example, pkgs.pkgsStatic

     

       416
       +
                   would not work in modules anymore.

     

       417
        
                 '';

     

       418
        
               }

     

       419
        
             ];

+6 -19

nixos/modules/misc/nixpkgs/read-only.nix

···

       40
        
                 The Nixpkgs overlays that `pkgs` was initialized with.

     

       41
        
               '';

     

       42
        
             };

     

       43
       -
             hostPlatform = mkOption {

     

       44
       -
               internal = true;

     

       45
       -
               readOnly = true;

     

       46
       -
               description = ''

     

       47
       -
                 The platform of the machine that is running the NixOS configuration.

     

       48
       -
               '';

     

       49
       -
             };

     

       50
       -
             buildPlatform = mkOption {

     

       51
       -
               internal = true;

     

       52
       -
               readOnly = true;

     

       53
       -
               description = ''

     

       54
       -
                 The platform of the machine that built the NixOS configuration.

     

       55
       -
               '';

     

       56
       -
             };

     

       57
        
             # NOTE: do not add the legacy options such as localSystem here. Let's keep

     

       58
        
             #       this module simple and let module authors upgrade their code instead.

     

       59
        
           };

     
···

       61
        
         config = {

     

       62
        
           _module.args.pkgs =

     

       63
        
             # find mistaken definitions

     

       64
       -
             builtins.seq cfg.config builtins.seq cfg.overlays builtins.seq cfg.hostPlatform builtins.seq

     

       65
       -
               cfg.buildPlatform

     

       66
       -
               cfg.pkgs;

     

       67
        
           nixpkgs.config = cfg.pkgs.config;

     

       68
        
           nixpkgs.overlays = cfg.pkgs.overlays;

     

       69
       -
           nixpkgs.hostPlatform = cfg.pkgs.stdenv.hostPlatform;

     

       70
       -
           nixpkgs.buildPlatform = cfg.pkgs.stdenv.buildPlatform;

     

       71
        
         };

     

       72
        
       }

···

       40
        
                 The Nixpkgs overlays that `pkgs` was initialized with.

     

       41
        
               '';

     

       42
        
             };

     

       43
       +
             # buildPlatform and hostPlatform left out on purpose:

     

       44
       +
             # - They are not supposed to be changed with this read-only module.

     

       45
       +
             # - They are not supposed to be read either, according to the description

     

       46
       +
             #   of "system" in the traditional nixpkgs module.

     

       47
       +
             #

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       48
        
             # NOTE: do not add the legacy options such as localSystem here. Let's keep

     

       49
        
             #       this module simple and let module authors upgrade their code instead.

     

       50
        
           };

     
···

       52
        
         config = {

     

       53
        
           _module.args.pkgs =

     

       54
        
             # find mistaken definitions

     

       55
       +
             builtins.seq cfg.config builtins.seq cfg.overlays cfg.pkgs;

     

       0
        
       
     

       0
        
       
     

       56
        
           nixpkgs.config = cfg.pkgs.config;

     

       57
        
           nixpkgs.overlays = cfg.pkgs.overlays;

     

       0
        
       
     

       0
        
       
     

       58
        
         };

     

       59
        
       }

+6 -2

nixos/modules/virtualisation/nixos-containers.nix

···

       506
        
                               config = {

     

       507
        
                                 nixpkgs =

     

       508
        
                                   if options.nixpkgs?hostPlatform

     

       509
       -
                                   then { inherit (host.pkgs.stdenv) hostPlatform; }

     

       510
       -
                                   else { localSystem = host.pkgs.stdenv.hostPlatform; }

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       511
        
                                 ;

     

       512
        
                                 boot.isContainer = true;

     

       513
        
                                 networking.hostName = mkDefault name;

···

       506
        
                               config = {

     

       507
        
                                 nixpkgs =

     

       508
        
                                   if options.nixpkgs?hostPlatform

     

       509
       +
                                   then {

     

       510
       +
                                     hostPlatform =

     

       511
       +
                                       if host.options.nixpkgs.hostPlatform.isDefined

     

       512
       +
                                       then host.config.nixpkgs.hostPlatform

     

       513
       +
                                       else lib.defaultTo host.config.nixpkgs.localSystem host.config.nixpkgs.crossSystem;

     

       514
       +
                                   } else { localSystem = lib.defaultTo host.config.nixpkgs.localSystem host.config.nixpkgs.crossSystem; }

     

       515
        
                                 ;

     

       516
        
                                 boot.isContainer = true;

     

       517
        
                                 networking.hostName = mkDefault name;

+2 -2

nixos/tests/appliance-repart-image-verity-store.nix

···

       40
        
               verityStore = {

     

       41
        
                 enable = true;

     

       42
        
                 # by default the module works with systemd-boot, for simplicity this test directly boots the UKI

     

       43
       -
                 ukiPath = "/EFI/BOOT/BOOT${lib.toUpper config.nixpkgs.hostPlatform.efiArch}.EFI";

     

       44
        
               };

     

       45
        
       

     

       46
        
               name = "appliance-verity-store-image";

     
···

       51
        
                   repartConfig = {

     

       52
        
                     Type = "esp";

     

       53
        
                     Format = "vfat";

     

       54
       -
                     SizeMinBytes = if config.nixpkgs.hostPlatform.isx86_64 then "64M" else "96M";

     

       55
        
                   };

     

       56
        
                 };

     

       57
        
                 ${partitionIds.store-verity}.repartConfig = {

···

       40
        
               verityStore = {

     

       41
        
                 enable = true;

     

       42
        
                 # by default the module works with systemd-boot, for simplicity this test directly boots the UKI

     

       43
       +
                 ukiPath = "/EFI/BOOT/BOOT${lib.toUpper pkgs.stdenv.hostPlatform.efiArch}.EFI";

     

       44
        
               };

     

       45
        
       

     

       46
        
               name = "appliance-verity-store-image";

     
···

       51
        
                   repartConfig = {

     

       52
        
                     Type = "esp";

     

       53
        
                     Format = "vfat";

     

       54
       +
                     SizeMinBytes = if pkgs.stdenv.hostPlatform.isx86_64 then "64M" else "96M";

     

       55
        
                   };

     

       56
        
                 };

     

       57
        
                 ${partitionIds.store-verity}.repartConfig = {

+2 -2

nixos/tests/appliance-repart-image.nix

···

       53
        
                 "esp" = {

     

       54
        
                   contents =

     

       55
        
                     let

     

       56
       -
                       efiArch = config.nixpkgs.hostPlatform.efiArch;

     

       57
        
                     in

     

       58
        
                     {

     

       59
        
                       "/EFI/BOOT/BOOT${lib.toUpper efiArch}.EFI".source =

     
···

       70
        
                     # aarch64 kernel seems to generally be a little bigger than the

     

       71
        
                     # x86_64 kernel. To stay on the safe side, leave some more slack

     

       72
        
                     # for every platform other than x86_64.

     

       73
       -
                     SizeMinBytes = if config.nixpkgs.hostPlatform.isx86_64 then "64M" else "96M";

     

       74
        
                   };

     

       75
        
                 };

     

       76
        
                 "swap" = {

···

       53
        
                 "esp" = {

     

       54
        
                   contents =

     

       55
        
                     let

     

       56
       +
                       efiArch = pkgs.stdenv.hostPlatform.efiArch;

     

       57
        
                     in

     

       58
        
                     {

     

       59
        
                       "/EFI/BOOT/BOOT${lib.toUpper efiArch}.EFI".source =

     
···

       70
        
                     # aarch64 kernel seems to generally be a little bigger than the

     

       71
        
                     # x86_64 kernel. To stay on the safe side, leave some more slack

     

       72
        
                     # for every platform other than x86_64.

     

       73
       +
                     SizeMinBytes = if pkgs.stdenv.hostPlatform.isx86_64 then "64M" else "96M";

     

       74
        
                   };

     

       75
        
                 };

     

       76
        
                 "swap" = {

+2 -2

pkgs/applications/video/vdr/softhddevice/default.nix

···

       15
        
       }:

     

       16
        
       stdenv.mkDerivation rec {

     

       17
        
         pname = "vdr-softhddevice";

     

       18
       -
         version = "2.4.2";

     

       19
        
       

     

       20
        
         src = fetchFromGitHub {

     

       21
        
           owner = "ua0lnj";

     

       22
        
           repo = "vdr-plugin-softhddevice";

     

       23
       -
           sha256 = "sha256-T/A85lkKCjBaEaXGxVTurc1VY01mBCTv8t8m5qzvtpY=";

     

       24
        
           rev = "v${version}";

     

       25
        
         };

     

       26

···

       15
        
       }:

     

       16
        
       stdenv.mkDerivation rec {

     

       17
        
         pname = "vdr-softhddevice";

     

       18
       +
         version = "2.4.3";

     

       19
        
       

     

       20
        
         src = fetchFromGitHub {

     

       21
        
           owner = "ua0lnj";

     

       22
        
           repo = "vdr-plugin-softhddevice";

     

       23
       +
           sha256 = "sha256-KN0PJ/yER2iqk8+UZvLsgmScTa/9rmeBcZ19/ljHNAk=";

     

       24
        
           rev = "v${version}";

     

       25
        
         };

     

       26

+2 -2

pkgs/by-name/ba/basex/package.nix

···

       11
        
       

     

       12
        
       stdenv.mkDerivation rec {

     

       13
        
         pname = "basex";

     

       14
       -
         version = "11.6";

     

       15
        
       

     

       16
        
         src = fetchurl {

     

       17
        
           url = "http://files.basex.org/releases/${version}/BaseX${

     

       18
        
             builtins.replaceStrings [ "." ] [ "" ] version

     

       19
        
           }.zip";

     

       20
       -
           hash = "sha256-JGf+eBBlzbg0UYQqpx/IjGhjOKWCvl5rfnYpYE+JWM4=";

     

       21
        
         };

     

       22
        
       

     

       23
        
         nativeBuildInputs = [

···

       11
        
       

     

       12
        
       stdenv.mkDerivation rec {

     

       13
        
         pname = "basex";

     

       14
       +
         version = "11.7";

     

       15
        
       

     

       16
        
         src = fetchurl {

     

       17
        
           url = "http://files.basex.org/releases/${version}/BaseX${

     

       18
        
             builtins.replaceStrings [ "." ] [ "" ] version

     

       19
        
           }.zip";

     

       20
       +
           hash = "sha256-4xeMdmfk6JmfetfDGlqKQYTMtf15vRGRKYRdyrC90Cc=";

     

       21
        
         };

     

       22
        
       

     

       23
        
         nativeBuildInputs = [

+3 -3

pkgs/by-name/bi/bilibili/sources.nix

···

       1
        
       # Generated by ./update.sh - do not update manually!

     

       2
        
       {

     

       3
       -
         version = "1.16.2-2";

     

       4
       -
         arm64-hash = "sha256-re+QOxuFEBmymJ4Cbsv+1UEDxWACudGoHOpha8PIAso=";

     

       5
       -
         x86_64-hash = "sha256-89I47II8g4Q7CIwxmt797SzeZlAvVu2cTh05puWZ8+8=";

     

       6
        
       }

···

       1
        
       # Generated by ./update.sh - do not update manually!

     

       2
        
       {

     

       3
       +
         version = "1.16.2-3";

     

       4
       +
         arm64-hash = "sha256-IRzBbURF/qbPiExihycfeAQQuxO1ZG9Zy/DGr5BeCVE=";

     

       5
       +
         x86_64-hash = "sha256-Es/1Dbs0/aV8zFYFBck4y2VaNYu4+nu0bdDvyyfsk9Q=";

     

       6
        
       }

+76

pkgs/by-name/ca/carburetor/package.nix

···

       1
       +
       {

     

       2
       +
         lib,

     

       3
       +
         fetchFromGitLab,

     

       4
       +
         fetchpatch2,

     

       5
       +
         python3Packages,

     

       6
       +
         appstream,

     

       7
       +
         desktop-file-utils,

     

       8
       +
         gobject-introspection,

     

       9
       +
         pkg-config,

     

       10
       +
         meson,

     

       11
       +
         wrapGAppsHook4,

     

       12
       +
         libadwaita,

     

       13
       +
         tractor,

     

       14
       +
       }:

     

       15
       +
       let

     

       16
       +
         # This package should be updated together with pkgs/by-name/tr/tractor/package.nix

     

       17
       +
         version = "5.0.0";

     

       18
       +
       in

     

       19
       +
       python3Packages.buildPythonApplication {

     

       20
       +
       

     

       21
       +
         pname = "carburetor";

     

       22
       +
         inherit version;

     

       23
       +
       

     

       24
       +
         pyproject = false;

     

       25
       +
       

     

       26
       +
         src = fetchFromGitLab {

     

       27
       +
           domain = "framagit.org";

     

       28
       +
           owner = "tractor";

     

       29
       +
           repo = "carburetor";

     

       30
       +
           tag = version;

     

       31
       +
           hash = "sha256-Z67bqjogPz5sz6JwM68z1jsaqvRBAOMDeBLcyLo+QLY=";

     

       32
       +
         };

     

       33
       +
       

     

       34
       +
         patches = [

     

       35
       +
           (fetchpatch2 {

     

       36
       +
             url = "https://framagit.org/tractor/carburetor/-/commit/620b70288942497abc20ad26c043b593f66e9e3b.diff";

     

       37
       +
             hash = "sha256-oFKLjvu+fwgyU4FIUb2K8jwXOP34P3pEazOhofwveJw=";

     

       38
       +
           })

     

       39
       +
         ];

     

       40
       +
       

     

       41
       +
         build-system = [

     

       42
       +
           meson

     

       43
       +
           python3Packages.meson-python

     

       44
       +
         ];

     

       45
       +
       

     

       46
       +
         nativeBuildInputs = [

     

       47
       +
           appstream

     

       48
       +
           desktop-file-utils

     

       49
       +
           gobject-introspection

     

       50
       +
           pkg-config

     

       51
       +
           wrapGAppsHook4

     

       52
       +
         ];

     

       53
       +
       

     

       54
       +
         buildInputs = [ libadwaita ];

     

       55
       +
       

     

       56
       +
         dependencies = [

     

       57
       +
           python3Packages.pycountry

     

       58
       +
           python3Packages.pygobject3

     

       59
       +
           tractor

     

       60
       +
         ];

     

       61
       +
       

     

       62
       +
         dontWrapGApps = true;

     

       63
       +
       

     

       64
       +
         preFixup = ''

     

       65
       +
           makeWrapperArgs+=("''${gappsWrapperArgs[@]}")

     

       66
       +
         '';

     

       67
       +
       

     

       68
       +
         meta = {

     

       69
       +
           homepage = "https://framagit.org/tractor/carburetor";

     

       70
       +
           description = "Graphical settings app for Tractor in GTK";

     

       71
       +
           license = lib.licenses.gpl3Plus;

     

       72
       +
           platforms = lib.platforms.linux;

     

       73
       +
           mainProgram = "carburetor";

     

       74
       +
           maintainers = with lib.maintainers; [ mksafavi ];

     

       75
       +
         };

     

       76
       +
       }

-14

pkgs/by-name/cl/clipper2/0001-fix-pc-paths.patch

···

       1
       -
       diff --git a/Clipper2.pc.cmakein b/Clipper2.pc.cmakein

     

       2
       -
       index 5632c93..0a5d6ba 100644

     

       3
       -
       --- a/Clipper2.pc.cmakein

     

       4
       -
       +++ b/Clipper2.pc.cmakein

     

       5
       -
       @@ -1,7 +1,7 @@

     

       6
       -
        prefix=@CMAKE_INSTALL_PREFIX@

     

       7
       -
        exec_prefix=${prefix}

     

       8
       -
       -libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@

     

       9
       -
       -includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@

     

       10
       -
       +libdir=@CMAKE_INSTALL_FULL_LIBDIR@

     

       11
       -
       +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@

     

       12
       -
       

     

       13
       -
        Name: Clipper2@PCFILE_LIB_SUFFIX@

     

       14
       -
        Description: A Polygon Clipping and Offsetting library in C++

+2 -6

pkgs/by-name/cl/clipper2/package.nix

···

       7
        
       

     

       8
        
       stdenv.mkDerivation rec {

     

       9
        
         pname = "clipper2";

     

       10
       -
         version = "1.4.0";

     

       11
        
       

     

       12
        
         src = fetchFromGitHub {

     

       13
        
           owner = "AngusJohnson";

     

       14
        
           repo = "Clipper2";

     

       15
        
           rev = "Clipper2_${version}";

     

       16
       -
           hash = "sha256-ASL9uKkXsWyIbD1qaKEL7gf/JuCqzZQZSKHwLT5dKJU=";

     

       17
        
         };

     

       18
        
       

     

       19
        
         sourceRoot = "${src.name}/CPP";

     
···

       26
        
           "-DCLIPPER2_EXAMPLES=OFF"

     

       27
        
           "-DCLIPPER2_TESTS=OFF"

     

       28
        
           "-DBUILD_SHARED_LIBS=ON"

     

       29
       -
         ];

     

       30
       -
       

     

       31
       -
         patches = [

     

       32
       -
           ./0001-fix-pc-paths.patch

     

       33
        
         ];

     

       34
        
       

     

       35
        
         meta = {

···

       7
        
       

     

       8
        
       stdenv.mkDerivation rec {

     

       9
        
         pname = "clipper2";

     

       10
       +
         version = "1.5.2";

     

       11
        
       

     

       12
        
         src = fetchFromGitHub {

     

       13
        
           owner = "AngusJohnson";

     

       14
        
           repo = "Clipper2";

     

       15
        
           rev = "Clipper2_${version}";

     

       16
       +
           hash = "sha256-UsTOqejcN8our4UswFBvPC5fV52qJfjQYoVMEU6vDPE=";

     

       17
        
         };

     

       18
        
       

     

       19
        
         sourceRoot = "${src.name}/CPP";

     
···

       26
        
           "-DCLIPPER2_EXAMPLES=OFF"

     

       27
        
           "-DCLIPPER2_TESTS=OFF"

     

       28
        
           "-DBUILD_SHARED_LIBS=ON"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       29
        
         ];

     

       30
        
       

     

       31
        
         meta = {

+5 -5

pkgs/by-name/cl/clouddrive2/package.nix

···

       11
        
       in

     

       12
        
       stdenv.mkDerivation (finalAttrs: {

     

       13
        
         pname = "clouddrive2";

     

       14
       -
         version = "0.8.6";

     

       15
        
       

     

       16
        
         src = fetchurl {

     

       17
        
           url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz";

     

       18
        
           hash =

     

       19
        
             {

     

       20
       -
               x86_64-linux = "sha256-79P356HchNTpiFd7V/XeOuFyS7xpS/SARyS7X7a3Ko4=";

     

       21
       -
               aarch64-linux = "sha256-GXjr4RZCRE+oz+ldpJ4lgN5LxPD/BU1544ApNqULHTc=";

     

       22
       -
               x86_64-darwin = "sha256-otkVfPTRYmdw818RESavkZh0PRpFyrum56TnNTol538=";

     

       23
       -
               aarch64-darwin = "sha256-hePGS4CJibSTqav5Gk2/U27SO1JAeReCSDpCaijCa74=";

     

       24
        
             }

     

       25
        
             .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");

     

       26
        
         };

···

       11
        
       in

     

       12
        
       stdenv.mkDerivation (finalAttrs: {

     

       13
        
         pname = "clouddrive2";

     

       14
       +
         version = "0.8.7";

     

       15
        
       

     

       16
        
         src = fetchurl {

     

       17
        
           url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz";

     

       18
        
           hash =

     

       19
        
             {

     

       20
       +
               x86_64-linux = "sha256-N5zZHBX0Vl4Ib3V2O4gXDQcNDibGInGDNNls226jMB0=";

     

       21
       +
               aarch64-linux = "sha256-Tk5tNJbwI8hq8ajYa2/oDWvKJaLI8E/estuWKVB17jg=";

     

       22
       +
               x86_64-darwin = "sha256-ySq8aXpCMQtU9jJFi7kJaPCRDtqZXyBRv9Zx3m3Ymms=";

     

       23
       +
               aarch64-darwin = "sha256-KMobDLbZ38tAetqP2DrHe9oClzzYpuTEyMV3oOgPVHI=";

     

       24
        
             }

     

       25
        
             .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");

     

       26
        
         };

+3 -3

pkgs/by-name/pa/parca-agent/package.nix

···

       7
        
       

     

       8
        
       buildGoModule rec {

     

       9
        
         pname = "parca-agent";

     

       10
       -
         version = "0.35.2";

     

       11
        
       

     

       12
        
         src = fetchFromGitHub {

     

       13
        
           owner = "parca-dev";

     

       14
        
           repo = "parca-agent";

     

       15
        
           tag = "v${version}";

     

       16
       -
           hash = "sha256-g+lUwo4Ng+Z103xya8CmGEoZ+vYVSpQu0CAaqafcinU=";

     

       17
        
           fetchSubmodules = true;

     

       18
        
         };

     

       19
        
       

     

       20
        
         proxyVendor = true;

     

       21
       -
         vendorHash = "sha256-0XeotSwudDdDaQ/d+htvDK3ajBK8FRElbssz7dy3XsI=";

     

       22
        
       

     

       23
        
         buildInputs = [

     

       24
        
           stdenv.cc.libc.static

···

       7
        
       

     

       8
        
       buildGoModule rec {

     

       9
        
         pname = "parca-agent";

     

       10
       +
         version = "0.36.0";

     

       11
        
       

     

       12
        
         src = fetchFromGitHub {

     

       13
        
           owner = "parca-dev";

     

       14
        
           repo = "parca-agent";

     

       15
        
           tag = "v${version}";

     

       16
       +
           hash = "sha256-06TrG4cDf5RjwScIhX4zEjcx4zlFCjnWySpZHmaXT7E=";

     

       17
        
           fetchSubmodules = true;

     

       18
        
         };

     

       19
        
       

     

       20
        
         proxyVendor = true;

     

       21
       +
         vendorHash = "sha256-6PD2qd0Qeqb1yQiQcOw0nRX6lWjLsWcLDTlmbz0T5+k=";

     

       22
        
       

     

       23
        
         buildInputs = [

     

       24
        
           stdenv.cc.libc.static

+3 -3

pkgs/by-name/sh/shopware-cli/package.nix

···

       10
        
       

     

       11
        
       buildGoModule rec {

     

       12
        
         pname = "shopware-cli";

     

       13
       -
         version = "0.4.62";

     

       14
        
         src = fetchFromGitHub {

     

       15
        
           repo = "shopware-cli";

     

       16
        
           owner = "FriendsOfShopware";

     

       17
        
           tag = version;

     

       18
       -
           hash = "sha256-nFjm1z7QXuUkZ4sVRY0KdFpo0SXBTmJNA28YJpAyG2w=";

     

       19
        
         };

     

       20
        
       

     

       21
        
         nativeBuildInputs = [

     
···

       27
        
           dart-sass

     

       28
        
         ];

     

       29
        
       

     

       30
       -
         vendorHash = "sha256-7DVC68tKoEwaTbF6Lkv1Ib1imZojTPW3G/QS3W6N8ys=";

     

       31
        
       

     

       32
        
         postInstall = ''

     

       33
        
           installShellCompletion --cmd shopware-cli \

···

       10
        
       

     

       11
        
       buildGoModule rec {

     

       12
        
         pname = "shopware-cli";

     

       13
       +
         version = "0.5.2";

     

       14
        
         src = fetchFromGitHub {

     

       15
        
           repo = "shopware-cli";

     

       16
        
           owner = "FriendsOfShopware";

     

       17
        
           tag = version;

     

       18
       +
           hash = "sha256-JgoFYCcCNMPQ8+ZAq7WcLaXI4YGrscweOJ8Ju1kAHHw=";

     

       19
        
         };

     

       20
        
       

     

       21
        
         nativeBuildInputs = [

     
···

       27
        
           dart-sass

     

       28
        
         ];

     

       29
        
       

     

       30
       +
         vendorHash = "sha256-PCyxnrVEXlJF69EEBBBq7kbJsnEl35PZxr5kgCovY7I=";

     

       31
        
       

     

       32
        
         postInstall = ''

     

       33
        
           installShellCompletion --cmd shopware-cli \

+2 -2

pkgs/by-name/st/stevenblack-blocklist/package.nix

···

       6
        
       }:

     

       7
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       8
        
         pname = "stevenblack-blocklist";

     

       9
       -
         version = "3.15.10";

     

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
        
           owner = "StevenBlack";

     

       13
        
           repo = "hosts";

     

       14
        
           tag = finalAttrs.version;

     

       15
       -
           hash = "sha256-f5SH4qQzRWYKwIjpzOuhI9mPwlyNcBWjr2mrCKLgml4=";

     

       16
        
         };

     

       17
        
       

     

       18
        
         outputs = [

···

       6
        
       }:

     

       7
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       8
        
         pname = "stevenblack-blocklist";

     

       9
       +
         version = "3.15.15";

     

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
        
           owner = "StevenBlack";

     

       13
        
           repo = "hosts";

     

       14
        
           tag = finalAttrs.version;

     

       15
       +
           hash = "sha256-wycPhloUQY24wUDFWd/URRlFUiW2hi/wcohrWQ5R8E4=";

     

       16
        
         };

     

       17
        
       

     

       18
        
         outputs = [

+13

pkgs/by-name/tr/tractor/fix-gsettings-schema.patch

···

       1
       +
       diff --git a/src/tractor/db.py b/src/tractor/db.py

     

       2
       +
       index 6f39bc4..22fbdd2 100644

     

       3
       +
       --- a/src/tractor/db.py

     

       4
       +
       +++ b/src/tractor/db.py

     

       5
       +
       @@ -15,7 +15,7 @@ def dconf() -> Gio.Settings:

     

       6
       +
            """

     

       7
       +
            schema = "org.tractor"

     

       8
       +
            schemas = Gio.SettingsSchemaSource.get_default()

     

       9
       +
       -    if not Gio.SettingsSchemaSource.lookup(schemas, schema, False):

     

       10
       +
       +    if not Gio.SettingsSchemaSource.lookup(schemas, schema, recursive=True):

     

       11
       +
                gschema_dir = "/usr/share/glib-2.0/schemas/"

     

       12
       +
                for directory in GLib.get_system_data_dirs():

     

       13
       +
                    gdir = f"{directory}/glib-2.0/schemas/"

+93

pkgs/by-name/tr/tractor/package.nix

···

       1
       +
       {

     

       2
       +
         lib,

     

       3
       +
         fetchFromGitLab,

     

       4
       +
         glib,

     

       5
       +
         python3Packages,

     

       6
       +
         gobject-introspection,

     

       7
       +
         gsettings-desktop-schemas,

     

       8
       +
         tor,

     

       9
       +
         obfs4,

     

       10
       +
         snowflake,

     

       11
       +
         conjure-tor,

     

       12
       +
         wrapGAppsHook4,

     

       13
       +
         withObfs4 ? true,

     

       14
       +
         withSnowflake ? true,

     

       15
       +
         withConjure ? true,

     

       16
       +
       }:

     

       17
       +
       

     

       18
       +
       let

     

       19
       +
         # This package should be updated together with pkgs/by-name/ca/carburetor/package.nix

     

       20
       +
         version = "5.0.0";

     

       21
       +
       in

     

       22
       +
       python3Packages.buildPythonApplication {

     

       23
       +
         pname = "tractor";

     

       24
       +
         inherit version;

     

       25
       +
       

     

       26
       +
         pyproject = true;

     

       27
       +
       

     

       28
       +
         src = fetchFromGitLab {

     

       29
       +
           domain = "framagit.org";

     

       30
       +
           owner = "tractor";

     

       31
       +
           repo = "tractor";

     

       32
       +
           tag = version;

     

       33
       +
           hash = "sha256-KyVL3dFofoi2TRtZo557X9P/RD16v94VuWdtdAskZk4=";

     

       34
       +
         };

     

       35
       +
       

     

       36
       +
         patches = [ ./fix-gsettings-schema.patch ];

     

       37
       +
       

     

       38
       +
         nativeBuildInputs = [

     

       39
       +
           glib

     

       40
       +
           gobject-introspection

     

       41
       +
           gsettings-desktop-schemas

     

       42
       +
           wrapGAppsHook4

     

       43
       +
         ];

     

       44
       +
       

     

       45
       +
         propagatedBuildInputs =

     

       46
       +
           [

     

       47
       +
             tor

     

       48
       +
           ]

     

       49
       +
           ++ lib.optional withObfs4 obfs4

     

       50
       +
           ++ lib.optional withSnowflake snowflake

     

       51
       +
           ++ lib.optional withConjure conjure-tor;

     

       52
       +
       

     

       53
       +
         dependencies = [

     

       54
       +
           python3Packages.setuptools

     

       55
       +
           python3Packages.fire

     

       56
       +
           python3Packages.pygobject3

     

       57
       +
           python3Packages.pysocks

     

       58
       +
           python3Packages.stem

     

       59
       +
         ];

     

       60
       +
       

     

       61
       +
         postInstall =

     

       62
       +
           ''

     

       63
       +
             mkdir -p "$out/share/glib-2.0/schemas"

     

       64
       +
             cp "$src/src/tractor/tractor.gschema.xml" "$out/share/glib-2.0/schemas"

     

       65
       +
           ''

     

       66
       +
           + lib.optionalString withObfs4 ''

     

       67
       +
             substituteInPlace "$out/share/glib-2.0/schemas/tractor.gschema.xml" --replace-fail '/usr/bin/obfs4proxy' '${obfs4}/bin/lyrebird'

     

       68
       +
           ''

     

       69
       +
           + lib.optionalString withSnowflake ''

     

       70
       +
             substituteInPlace "$out/share/glib-2.0/schemas/tractor.gschema.xml" --replace-fail '/usr/bin/snowflake-client' '${snowflake}/bin/client'

     

       71
       +
           ''

     

       72
       +
           + lib.optionalString withConjure ''

     

       73
       +
             substituteInPlace "$out/share/glib-2.0/schemas/tractor.gschema.xml" --replace-fail '/usr/bin/conjure-client' '${conjure-tor}/bin/client'

     

       74
       +
           ''

     

       75
       +
           + ''

     

       76
       +
             glib-compile-schemas "$out/share/glib-2.0/schemas"

     

       77
       +
           '';

     

       78
       +
       

     

       79
       +
         dontWrapGApps = true;

     

       80
       +
       

     

       81
       +
         preFixup = ''

     

       82
       +
           makeWrapperArgs+=("''${gappsWrapperArgs[@]}")

     

       83
       +
         '';

     

       84
       +
       

     

       85
       +
         meta = {

     

       86
       +
           homepage = "https://framagit.org/tractor/tractor";

     

       87
       +
           description = "Setup a proxy with Onion Routing via TOR and optionally obfs4proxy";

     

       88
       +
           license = lib.licenses.gpl3Plus;

     

       89
       +
           platforms = lib.platforms.linux;

     

       90
       +
           mainProgram = "tractor";

     

       91
       +
           maintainers = with lib.maintainers; [ mksafavi ];

     

       92
       +
         };

     

       93
       +
       }

+2 -2

pkgs/by-name/yt/ytdl-sub/package.nix

···

       8
        
       }:

     

       9
        
       python3Packages.buildPythonApplication rec {

     

       10
        
         pname = "ytdl-sub";

     

       11
       -
         version = "2025.01.17";

     

       12
        
         pyproject = true;

     

       13
        
       

     

       14
        
         src = fetchFromGitHub {

     

       15
        
           owner = "jmbannon";

     

       16
        
           repo = "ytdl-sub";

     

       17
        
           tag = version;

     

       18
       -
           hash = "sha256-6RazXOXkBXwhJz8eNhrLIoEAVXnFEAF3O+SDKSjAlYo=";

     

       19
        
         };

     

       20
        
       

     

       21
        
         postPatch = ''

···

       8
        
       }:

     

       9
        
       python3Packages.buildPythonApplication rec {

     

       10
        
         pname = "ytdl-sub";

     

       11
       +
         version = "2025.01.28";

     

       12
        
         pyproject = true;

     

       13
        
       

     

       14
        
         src = fetchFromGitHub {

     

       15
        
           owner = "jmbannon";

     

       16
        
           repo = "ytdl-sub";

     

       17
        
           tag = version;

     

       18
       +
           hash = "sha256-V1qz6YNI/4bGbMOEbedTOGxmInMjzGhmk5lG9qkGNsg=";

     

       19
        
         };

     

       20
        
       

     

       21
        
         postPatch = ''

+66

pkgs/development/python-modules/compressed-tensors/default.nix

···

       1
       +
       {

     

       2
       +
         lib,

     

       3
       +
         buildPythonPackage,

     

       4
       +
         fetchFromGitHub,

     

       5
       +
         setuptools,

     

       6
       +
         pydantic,

     

       7
       +
         torch,

     

       8
       +
         transformers,

     

       9
       +
         nbconvert,

     

       10
       +
         nbformat,

     

       11
       +
         pytestCheckHook,

     

       12
       +
       }:

     

       13
       +
       

     

       14
       +
       buildPythonPackage rec {

     

       15
       +
         pname = "compressed-tensors";

     

       16
       +
         version = "0.9.1";

     

       17
       +
         pyproject = true;

     

       18
       +
       

     

       19
       +
         # Release on PyPI is missing the `utils` directory, which `setup.py` wants to import

     

       20
       +
         src = fetchFromGitHub {

     

       21
       +
           owner = "neuralmagic";

     

       22
       +
           repo = pname;

     

       23
       +
           tag = version;

     

       24
       +
           hash = "sha256-AsbNFBvHxjiLl0T4JnQ5QrZdERUUYgS4iJvMRQytzN4=";

     

       25
       +
         };

     

       26
       +
       

     

       27
       +
         build-system = [ setuptools ];

     

       28
       +
       

     

       29
       +
         dependencies = [

     

       30
       +
           pydantic

     

       31
       +
           torch

     

       32
       +
           transformers

     

       33
       +
         ];

     

       34
       +
       

     

       35
       +
         doCheck = true;

     

       36
       +
       

     

       37
       +
         pythonImportsCheck = [ "compressed_tensors" ];

     

       38
       +
       

     

       39
       +
         nativeCheckInputs = [

     

       40
       +
           nbconvert

     

       41
       +
           nbformat

     

       42
       +
           pytestCheckHook

     

       43
       +
         ];

     

       44
       +
       

     

       45
       +
         disabledTests = [

     

       46
       +
           # these try to download models from HF Hub

     

       47
       +
           "test_get_observer_token_count"

     

       48
       +
           "test_kv_cache_quantization"

     

       49
       +
           "test_target_prioritization"

     

       50
       +
           "test_load_compressed_sharded"

     

       51
       +
           "test_save_compressed_model"

     

       52
       +
           "test_apply_tinyllama_dynamic_activations"

     

       53
       +
         ];

     

       54
       +
       

     

       55
       +
         disabledTestPaths = [

     

       56
       +
           # these try to download models from HF Hub

     

       57
       +
           "tests/test_quantization/lifecycle/test_apply.py"

     

       58
       +
         ];

     

       59
       +
       

     

       60
       +
         meta = with lib; {

     

       61
       +
           description = "A safetensors extension to efficiently store sparse quantized tensors on disk";

     

       62
       +
           homepage = "https://github.com/neuralmagic/compressed-tensors";

     

       63
       +
           license = licenses.asl20;

     

       64
       +
           maintainers = [ ];

     

       65
       +
         };

     

       66
       +
       }

+57

pkgs/development/python-modules/mistral-common/default.nix

···

       1
       +
       {

     

       2
       +
         lib,

     

       3
       +
         buildPythonPackage,

     

       4
       +
         fetchPypi,

     

       5
       +
         poetry-core,

     

       6
       +
         numpy,

     

       7
       +
         pydantic,

     

       8
       +
         jsonschema,

     

       9
       +
         sentencepiece,

     

       10
       +
         typing-extensions,

     

       11
       +
         tiktoken,

     

       12
       +
         pillow,

     

       13
       +
         requests,

     

       14
       +
       }:

     

       15
       +
       

     

       16
       +
       buildPythonPackage rec {

     

       17
       +
         pname = "mistral-common";

     

       18
       +
         version = "1.5.2";

     

       19
       +
         pyproject = true;

     

       20
       +
       

     

       21
       +
         src = fetchPypi {

     

       22
       +
           pname = "mistral_common";

     

       23
       +
           inherit version;

     

       24
       +
           hash = "sha256-nRFXsTdsSdNav8dD2+AITyyjezpavQPnQSdqG8ZshS8=";

     

       25
       +
         };

     

       26
       +
       

     

       27
       +
         # relax dependencies

     

       28
       +
         postPatch = ''

     

       29
       +
           substituteInPlace pyproject.toml \

     

       30
       +
             --replace-fail 'pillow = "^10.3.0"' 'pillow = ">=10.3.0"' \

     

       31
       +
             --replace-fail 'tiktoken = "^0.7.0"' 'tiktoken = ">=0.7.0"' \

     

       32
       +
         '';

     

       33
       +
       

     

       34
       +
         build-system = [ poetry-core ];

     

       35
       +
       

     

       36
       +
         dependencies = [

     

       37
       +
           numpy

     

       38
       +
           pydantic

     

       39
       +
           jsonschema

     

       40
       +
           sentencepiece

     

       41
       +
           typing-extensions

     

       42
       +
           tiktoken

     

       43
       +
           pillow

     

       44
       +
           requests

     

       45
       +
         ];

     

       46
       +
       

     

       47
       +
         doCheck = true;

     

       48
       +
       

     

       49
       +
         pythonImportsCheck = [ "mistral_common" ];

     

       50
       +
       

     

       51
       +
         meta = with lib; {

     

       52
       +
           description = "mistral-common is a set of tools to help you work with Mistral models.";

     

       53
       +
           homepage = "https://github.com/mistralai/mistral-common";

     

       54
       +
           license = licenses.asl20;

     

       55
       +
           maintainers = with maintainers; [ bgamari ];

     

       56
       +
         };

     

       57
       +
       }

+1 -1

pkgs/development/python-modules/mocket/default.nix

···

       98
        
           "test_no_dangling_fds"

     

       99
        
         ];

     

       100
        
       

     

       101
       -
         disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/main/test_redis.py" ];

     

       102
        
       

     

       103
        
         pythonImportsCheck = [ "mocket" ];

     

       104

···

       98
        
           "test_no_dangling_fds"

     

       99
        
         ];

     

       100
        
       

     

       101
       +
         disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_redis.py" ];

     

       102
        
       

     

       103
        
         pythonImportsCheck = [ "mocket" ];

     

       104

+42

pkgs/development/python-modules/partial-json-parser/default.nix

···

       1
       +
       {

     

       2
       +
         lib,

     

       3
       +
         buildPythonPackage,

     

       4
       +
         fetchPypi,

     

       5
       +
         pdm-backend,

     

       6
       +
         tqdm,

     

       7
       +
         hypothesis,

     

       8
       +
         pytest,

     

       9
       +
       }:

     

       10
       +
       

     

       11
       +
       buildPythonPackage rec {

     

       12
       +
         pname = "partial-json-parser";

     

       13
       +
         version = "0.2.1.1.post5";

     

       14
       +
         pyproject = true;

     

       15
       +
       

     

       16
       +
         src = fetchPypi {

     

       17
       +
           pname = "partial_json_parser";

     

       18
       +
           inherit version;

     

       19
       +
           hash = "sha256-mScQrGfpCzZ5IdUnJ2mJKAQPdxO6fsszuWNx6nrsgso=";

     

       20
       +
         };

     

       21
       +
       

     

       22
       +
         build-system = [ pdm-backend ];

     

       23
       +
       

     

       24
       +
         dependencies = [ ];

     

       25
       +
       

     

       26
       +
         doCheck = true;

     

       27
       +
       

     

       28
       +
         pythonImportsCheck = [ "partial_json_parser" ];

     

       29
       +
       

     

       30
       +
         dev-dependencies = [

     

       31
       +
           hypothesis

     

       32
       +
           tqdm

     

       33
       +
           pytest

     

       34
       +
         ];

     

       35
       +
       

     

       36
       +
         meta = with lib; {

     

       37
       +
           description = "Parse partial JSON generated by LLM";

     

       38
       +
           homepage = "https://github.com/promplate/partial-json-parser";

     

       39
       +
           license = licenses.mit;

     

       40
       +
           maintainers = [ ];

     

       41
       +
         };

     

       42
       +
       }

+2 -2

pkgs/servers/minio/default.nix

···

       30
        
       in

     

       31
        
       buildGoModule rec {

     

       32
        
         pname = "minio";

     

       33
       -
         version = "2025-01-18T00-31-37Z";

     

       34
        
       

     

       35
        
         src = fetchFromGitHub {

     

       36
        
           owner = "minio";

     

       37
        
           repo = "minio";

     

       38
        
           rev = "RELEASE.${version}";

     

       39
       -
           hash = "sha256-ppw8daJk5cS3fkKlIk6CQudOICHUp/M4LvDhJKKdg2Y=";

     

       40
        
         };

     

       41
        
       

     

       42
        
         vendorHash = "sha256-zb/A7vOsZIMLkGVmgVbrCt/lY2K8v7ofTgSA0Z3dvXA=";

···

       30
        
       in

     

       31
        
       buildGoModule rec {

     

       32
        
         pname = "minio";

     

       33
       +
         version = "2025-01-20T14-49-07Z";

     

       34
        
       

     

       35
        
         src = fetchFromGitHub {

     

       36
        
           owner = "minio";

     

       37
        
           repo = "minio";

     

       38
        
           rev = "RELEASE.${version}";

     

       39
       +
           hash = "sha256-0lYRMNPnXVncTrYP87T76eV4wkgH/ODNL6pvhs17pr4=";

     

       40
        
         };

     

       41
        
       

     

       42
        
         vendorHash = "sha256-zb/A7vOsZIMLkGVmgVbrCt/lY2K8v7ofTgSA0Z3dvXA=";

pkgs/servers/sql/postgresql/buildPostgresqlExtension.nix

···

       84
        
                   ));

     

       85
        
               };

     

       86
        
       

     

       0
        
       
     

       87
        
             buildInputs = [ postgresql ] ++ prevAttrs.buildInputs or [ ];

     

       0
        
       
     

       88
        
       

     

       89
        
             installFlags = [

     

       90
        
               "DESTDIR=${placeholder "out"}"

···

       84
        
                   ));

     

       85
        
               };

     

       86
        
       

     

       87
       +
             strictDeps = true;

     

       88
        
             buildInputs = [ postgresql ] ++ prevAttrs.buildInputs or [ ];

     

       89
       +
             nativeBuildInputs = [ postgresql ] ++ prevAttrs.nativeBuildInputs or [ ];

     

       90
        
       

     

       91
        
             installFlags = [

     

       92
        
               "DESTDIR=${placeholder "out"}"

+1 -3

pkgs/servers/sql/postgresql/ext/anonymizer.nix

···

       15
        
       

     

       16
        
         inherit (pg-dump-anon) version src;

     

       17
        
       

     

       18
       -
         nativeBuildInputs = [ postgresql ] ++ lib.optional jitSupport llvm;

     

       19
       -
       

     

       20
       -
         strictDeps = true;

     

       21
        
       

     

       22
        
         # Needs to be after postInstall, where removeNestedNixStore runs

     

       23
        
         preFixup = ''

···

       15
        
       

     

       16
        
         inherit (pg-dump-anon) version src;

     

       17
        
       

     

       18
       +
         nativeBuildInputs = lib.optional jitSupport llvm;

     

       0
        
       
     

       0
        
       
     

       19
        
       

     

       20
        
         # Needs to be after postInstall, where removeNestedNixStore runs

     

       21
        
         preFixup = ''

+3 -2

pkgs/servers/sql/postgresql/ext/apache_datasketches.nix

···

       3
        
         lib,

     

       4
        
         fetchFromGitHub,

     

       5
        
         postgresql,

     

       6
       -
         boost,

     

       7
        
         postgresqlTestExtension,

     

       8
        
         buildPostgresqlExtension,

     

       9
        
       }:

     
···

       39
        
       

     

       40
        
         sourceRoot = main_src.name;

     

       41
        
       

     

       42
       -
         buildInputs = [ boost ];

     

       0
        
       
     

       43
        
       

     

       44
        
         patchPhase = ''

     

       45
        
           runHook prePatch

···

       3
        
         lib,

     

       4
        
         fetchFromGitHub,

     

       5
        
         postgresql,

     

       6
       +
         boost186,

     

       7
        
         postgresqlTestExtension,

     

       8
        
         buildPostgresqlExtension,

     

       9
        
       }:

     
···

       39
        
       

     

       40
        
         sourceRoot = main_src.name;

     

       41
        
       

     

       42
       +
         # fails to build with boost 1.87

     

       43
       +
         buildInputs = [ boost186 ];

     

       44
        
       

     

       45
        
         patchPhase = ''

     

       46
        
           runHook prePatch

pkgs/servers/sql/postgresql/ext/cstore_fdw.nix

···

       11
        
         pname = "cstore_fdw";

     

       12
        
         version = "1.7.0-unstable-2021-03-08";

     

       13
        
       

     

       0
        
       
     

       14
        
         nativeBuildInputs = [ protobufc ];

     

       15
        
       

     

       16
        
         src = fetchFromGitHub {

···

       11
        
         pname = "cstore_fdw";

     

       12
        
         version = "1.7.0-unstable-2021-03-08";

     

       13
        
       

     

       14
       +
         buildInputs = [ protobufc ];

     

       15
        
         nativeBuildInputs = [ protobufc ];

     

       16
        
       

     

       17
        
         src = fetchFromGitHub {

-3

pkgs/servers/sql/postgresql/ext/pg-gvm.nix

···

       23
        
           hash = "sha256-Sa9ltW3KV/69OCxD3gRcp5owL0oW+z3fs4fRBHbSh30=";

     

       24
        
         };

     

       25
        
       

     

       26
       -
         strictDeps = true;

     

       27
       -
       

     

       28
        
         nativeBuildInputs = [

     

       29
        
           cmake

     

       30
        
           pkg-config

     

       31
       -
           postgresql

     

       32
        
         ];

     

       33
        
       

     

       34
        
         buildInputs = [

···

       23
        
           hash = "sha256-Sa9ltW3KV/69OCxD3gRcp5owL0oW+z3fs4fRBHbSh30=";

     

       24
        
         };

     

       25
        
       

     

       0
        
       
     

       0
        
       
     

       26
        
         nativeBuildInputs = [

     

       27
        
           cmake

     

       28
        
           pkg-config

     

       0
        
       
     

       29
        
         ];

     

       30
        
       

     

       31
        
         buildInputs = [

+3 -2

pkgs/servers/sql/postgresql/ext/pg_ed25519.nix

···

       9
        
       buildPostgresqlExtension rec {

     

       10
        
         pname = "pg_ed25519";

     

       11
        
         version = "0.2";

     

       0
        
       
     

       12
        
         src = fetchFromGitLab {

     

       13
        
           owner = "dwagin";

     

       14
        
           repo = "pg_ed25519";

     
···

       22
        
           maintainers = [ maintainers.renzo ];

     

       23
        
           platforms = postgresql.meta.platforms;

     

       24
        
           license = licenses.mit;

     

       25
       -
           # Broken on darwin and linux (JIT) with no upstream fix available.

     

       26
       -
           broken = lib.versionAtLeast postgresql.version "16" && stdenv.cc.isClang;

     

       27
        
         };

     

       28
        
       }

···

       9
        
       buildPostgresqlExtension rec {

     

       10
        
         pname = "pg_ed25519";

     

       11
        
         version = "0.2";

     

       12
       +
       

     

       13
        
         src = fetchFromGitLab {

     

       14
        
           owner = "dwagin";

     

       15
        
           repo = "pg_ed25519";

     
···

       23
        
           maintainers = [ maintainers.renzo ];

     

       24
        
           platforms = postgresql.meta.platforms;

     

       25
        
           license = licenses.mit;

     

       26
       +
           # Broken with no upstream fix available.

     

       27
       +
           broken = lib.versionAtLeast postgresql.version "16";

     

       28
        
         };

     

       29
        
       }

pkgs/servers/sql/postgresql/ext/pgsql-http.nix

···

       19
        
         };

     

       20
        
       

     

       21
        
         buildInputs = [ curl ];

     

       0
        
       
     

       22
        
       

     

       23
        
         meta = with lib; {

     

       24
        
           description = "HTTP client for PostgreSQL, retrieve a web page from inside the database";

···

       19
        
         };

     

       20
        
       

     

       21
        
         buildInputs = [ curl ];

     

       22
       +
         nativeBuildInputs = [ curl ];

     

       23
        
       

     

       24
        
         meta = with lib; {

     

       25
        
           description = "HTTP client for PostgreSQL, retrieve a web page from inside the database";

-1

pkgs/servers/sql/postgresql/ext/pgtap.nix

···

       22
        
         };

     

       23
        
       

     

       24
        
         nativeBuildInputs = [

     

       25
       -
           postgresql

     

       26
        
           perl

     

       27
        
           perlPackages.TAPParserSourceHandlerpgTAP

     

       28
        
           which

···

       22
        
         };

     

       23
        
       

     

       24
        
         nativeBuildInputs = [

     

       0
        
       
     

       25
        
           perl

     

       26
        
           perlPackages.TAPParserSourceHandlerpgTAP

     

       27
        
           which

+2 -1

pkgs/servers/sql/postgresql/ext/postgis.nix

···

       51
        
       

     

       52
        
         buildInputs =

     

       53
        
           [

     

       54
       -
             libxml2

     

       55
        
             geos

     

       56
        
             proj

     

       57
        
             gdal

     
···

       65
        
           autoconf

     

       66
        
           automake

     

       67
        
           libtool

     

       0
        
       
     

       68
        
           perl

     

       69
        
           pkg-config

     

       0
        
       
     

       70
        
           which

     

       71
        
         ] ++ lib.optional jitSupport llvm;

     

       72
        
         dontDisableStatic = true;

···

       51
        
       

     

       52
        
         buildInputs =

     

       53
        
           [

     

       0
        
       
     

       54
        
             geos

     

       55
        
             proj

     

       56
        
             gdal

     
···

       64
        
           autoconf

     

       65
        
           automake

     

       66
        
           libtool

     

       67
       +
           libxml2

     

       68
        
           perl

     

       69
        
           pkg-config

     

       70
       +
           protobufc

     

       71
        
           which

     

       72
        
         ] ++ lib.optional jitSupport llvm;

     

       73
        
         dontDisableStatic = true;

+2 -2

pkgs/servers/sql/postgresql/ext/smlar.nix

···

       24
        
           platforms = postgresql.meta.platforms;

     

       25
        
           license = licenses.bsd2;

     

       26
        
           maintainers = [ ];

     

       27
       -
           # Broken on darwin and linux (JIT) with no upstream fix available.

     

       28
       -
           broken = lib.versionAtLeast postgresql.version "16" && stdenv.cc.isClang;

     

       29
        
         };

     

       30
        
       }

···

       24
        
           platforms = postgresql.meta.platforms;

     

       25
        
           license = licenses.bsd2;

     

       26
        
           maintainers = [ ];

     

       27
       +
           # Broken with no upstream fix available.

     

       28
       +
           broken = lib.versionAtLeast postgresql.version "16";

     

       29
        
         };

     

       30
        
       }

+128

pkgs/test/top-level/stage.nix

···

       1
       +
       # run like this:

     

       2
       +
       #  nix-build pkgs/test/top-level/stage.nix

     

       3
       +
       {

     

       4
       +
         localSystem ? {

     

       5
       +
           system = builtins.currentSystem;

     

       6
       +
         },

     

       7
       +
       }:

     

       8
       +
       

     

       9
       +
       with import ../../top-level { inherit localSystem; };

     

       10
       +
       

     

       11
       +
       let

     

       12
       +
         # To silence platform specific evaluation errors

     

       13
       +
         discardEvaluationErrors = e: (builtins.tryEval e).success -> e;

     

       14
       +
       

     

       15
       +
         # Basic test for idempotency of the package set, i.e:

     

       16
       +
         # Applying the same package set twice should work and

     

       17
       +
         # not change anything.

     

       18
       +
         isIdempotent = set: discardEvaluationErrors (pkgs.${set}.stdenv == pkgs.${set}.${set}.stdenv);

     

       19
       +
       

     

       20
       +
         # Some package sets should be noops in certain circumstances.

     

       21
       +
         # This is very similar to the idempotency test, but not going

     

       22
       +
         # via the super' overlay.

     

       23
       +
         isNoop =

     

       24
       +
           parent: child:

     

       25
       +
           discardEvaluationErrors (

     

       26
       +
             (lib.getAttrFromPath parent pkgs).stdenv == (lib.getAttrFromPath parent pkgs).${child}.stdenv

     

       27
       +
           );

     

       28
       +
       

     

       29
       +
         allMuslExamples = builtins.attrNames (

     

       30
       +
           lib.filterAttrs (_: system: lib.hasSuffix "-musl" system.config) lib.systems.examples

     

       31
       +
         );

     

       32
       +
       

     

       33
       +
         allLLVMExamples = builtins.attrNames (

     

       34
       +
           lib.filterAttrs (_: system: system.useLLVM or false) lib.systems.examples

     

       35
       +
         );

     

       36
       +
       

     

       37
       +
         # A package set should only change specific configuration, but needs

     

       38
       +
         # to keep all other configuration from previous layers in place.

     

       39
       +
         # Each package set has one or more key characteristics for which we

     

       40
       +
         # test here. Those should be kept, even when applying the "set" package

     

       41
       +
         # set.

     

       42
       +
         isComposable =

     

       43
       +
           set:

     

       44
       +
           (

     

       45
       +
             # Can't compose two different libcs...

     

       46
       +
             builtins.elem set [ "pkgsLLVMLibc" ]

     

       47
       +
             || discardEvaluationErrors (

     

       48
       +
               pkgsCross.mingwW64.${set}.stdenv.hostPlatform.config == "x86_64-w64-mingw32"

     

       49
       +
             )

     

       50
       +
           )

     

       51
       +
           && (

     

       52
       +
             # Can't compose two different libcs...

     

       53
       +
             builtins.elem set [ "pkgsLLVMLibc" ]

     

       54
       +
             || discardEvaluationErrors (pkgsCross.mingwW64.${set}.stdenv.hostPlatform.libc == "msvcrt")

     

       55
       +
           )

     

       56
       +
           && discardEvaluationErrors (pkgsCross.ppc64-musl.${set}.stdenv.hostPlatform.gcc.abi == "elfv2")

     

       57
       +
           && discardEvaluationErrors (

     

       58
       +
             builtins.elem "trivialautovarinit" pkgs.pkgsExtraHardening.${set}.stdenv.cc.defaultHardeningFlags

     

       59
       +
           )

     

       60
       +
           && discardEvaluationErrors (pkgs.pkgsLLVM.${set}.stdenv.hostPlatform.useLLVM)

     

       61
       +
           && (

     

       62
       +
             # Can't compose two different libcs...

     

       63
       +
             builtins.elem set [

     

       64
       +
               "pkgsMusl"

     

       65
       +
               "pkgsStatic"

     

       66
       +
             ]

     

       67
       +
             || discardEvaluationErrors (pkgs.pkgsLLVMLibc.${set}.stdenv.hostPlatform.isLLVMLibc)

     

       68
       +
           )

     

       69
       +
           && discardEvaluationErrors (pkgs.pkgsArocc.${set}.stdenv.hostPlatform.useArocc)

     

       70
       +
           && discardEvaluationErrors (pkgs.pkgsZig.${set}.stdenv.hostPlatform.useZig)

     

       71
       +
           && discardEvaluationErrors (pkgs.pkgsLinux.${set}.stdenv.buildPlatform.isLinux)

     

       72
       +
           && (

     

       73
       +
             # Can't compose two different libcs...

     

       74
       +
             builtins.elem set [ "pkgsLLVMLibc" ]

     

       75
       +
             || discardEvaluationErrors (pkgs.pkgsMusl.${set}.stdenv.hostPlatform.isMusl)

     

       76
       +
           )

     

       77
       +
           && discardEvaluationErrors (pkgs.pkgsStatic.${set}.stdenv.hostPlatform.isStatic)

     

       78
       +
           && discardEvaluationErrors (pkgs.pkgsi686Linux.${set}.stdenv.hostPlatform.isx86_32)

     

       79
       +
           && discardEvaluationErrors (pkgs.pkgsx86_64Darwin.${set}.stdenv.hostPlatform.isx86_64);

     

       80
       +
       in

     

       81
       +
       

     

       82
       +
       # Appends same defaultHardeningFlags again on each .pkgsExtraHardening - thus not idempotent.

     

       83
       +
       # assert isIdempotent "pkgsExtraHardening";

     

       84
       +
       # TODO: Remove the isDarwin condition, which currently results in infinite recursion.

     

       85
       +
       # Also see https://github.com/NixOS/nixpkgs/pull/330567#discussion_r1894653309

     

       86
       +
       assert (stdenv.hostPlatform.isDarwin || isIdempotent "pkgsLLVM");

     

       87
       +
       # TODO: This currently results in infinite recursion, even on Linux

     

       88
       +
       # assert isIdempotent "pkgsLLVMLibc";

     

       89
       +
       assert isIdempotent "pkgsArocc";

     

       90
       +
       assert isIdempotent "pkgsZig";

     

       91
       +
       assert isIdempotent "pkgsLinux";

     

       92
       +
       assert isIdempotent "pkgsMusl";

     

       93
       +
       assert isIdempotent "pkgsStatic";

     

       94
       +
       assert isIdempotent "pkgsi686Linux";

     

       95
       +
       assert isIdempotent "pkgsx86_64Darwin";

     

       96
       +
       

     

       97
       +
       assert isNoop [ "pkgsStatic" ] "pkgsMusl";

     

       98
       +
       assert lib.all (sys: isNoop [ "pkgsCross" sys ] "pkgsMusl") allMuslExamples;

     

       99
       +
       assert lib.all (sys: isNoop [ "pkgsCross" sys ] "pkgsLLVM") allLLVMExamples;

     

       100
       +
       

     

       101
       +
       assert isComposable "pkgsExtraHardening";

     

       102
       +
       assert isComposable "pkgsLLVM";

     

       103
       +
       # TODO: Results in infinite recursion

     

       104
       +
       # assert isComposable "pkgsLLVMLibc";

     

       105
       +
       assert isComposable "pkgsArocc";

     

       106
       +
       # TODO: unexpected argument 'bintools' - uncomment once https://github.com/NixOS/nixpkgs/pull/331011 is done

     

       107
       +
       # assert isComposable "pkgsZig";

     

       108
       +
       assert isComposable "pkgsMusl";

     

       109
       +
       assert isComposable "pkgsStatic";

     

       110
       +
       assert isComposable "pkgsi686Linux";

     

       111
       +
       

     

       112
       +
       # Special cases regarding buildPlatform vs hostPlatform

     

       113
       +
       assert discardEvaluationErrors (pkgsCross.gnu64.pkgsMusl.stdenv.hostPlatform.isMusl);

     

       114
       +
       assert discardEvaluationErrors (pkgsCross.gnu64.pkgsi686Linux.stdenv.hostPlatform.isx86_32);

     

       115
       +
       assert discardEvaluationErrors (pkgsCross.mingwW64.pkgsLinux.stdenv.hostPlatform.isLinux);

     

       116
       +
       assert discardEvaluationErrors (

     

       117
       +
         pkgsCross.aarch64-darwin.pkgsx86_64Darwin.stdenv.hostPlatform.isx86_64

     

       118
       +
       );

     

       119
       +
       

     

       120
       +
       # pkgsCross should keep upper cross settings

     

       121
       +
       assert discardEvaluationErrors (

     

       122
       +
         with pkgsStatic.pkgsCross.gnu64.stdenv.hostPlatform; isGnu && isStatic

     

       123
       +
       );

     

       124
       +
       assert discardEvaluationErrors (

     

       125
       +
         with pkgsLLVM.pkgsCross.musl64.stdenv.hostPlatform; isMusl && useLLVM

     

       126
       +
       );

     

       127
       +
       

     

       128
       +
       emptyFile

+3 -3

pkgs/top-level/all-packages.nix

···

       1667
        
         #     pkgsCross.aarch64-multiplatform.freshBootstrapTools.build

     

       1668
        
         freshBootstrapTools = if stdenv.hostPlatform.isDarwin then

     

       1669
        
           callPackage ../stdenv/darwin/make-bootstrap-tools.nix {

     

       1670
       -
             localSystem = stdenv.buildPlatform;

     

       1671
        
             crossSystem =

     

       1672
       -
               if stdenv.buildPlatform == stdenv.hostPlatform then null else stdenv.hostPlatform;

     

       1673
        
           }

     

       1674
        
         else if stdenv.hostPlatform.isLinux then

     

       1675
        
           callPackage ../stdenv/linux/make-bootstrap-tools.nix {}

     
···

       17730
        
                       [(

     

       17731
        
                         { lib, ... }: {

     

       17732
        
                           config.nixpkgs.pkgs = lib.mkDefault pkgs;

     

       17733
       -
                           config.nixpkgs.localSystem = lib.mkDefault stdenv.hostPlatform;

     

       17734
        
                         }

     

       17735
        
                       )] ++ (

     

       17736
        
                         if builtins.isList configuration

···

       1667
        
         #     pkgsCross.aarch64-multiplatform.freshBootstrapTools.build

     

       1668
        
         freshBootstrapTools = if stdenv.hostPlatform.isDarwin then

     

       1669
        
           callPackage ../stdenv/darwin/make-bootstrap-tools.nix {

     

       1670
       +
             localSystem = { config = lib.systems.parse.tripleFromSystem stdenv.buildPlatform; };

     

       1671
        
             crossSystem =

     

       1672
       +
               if stdenv.buildPlatform == stdenv.hostPlatform then null else { config = lib.systems.parse.tripleFromSystem stdenv.hostPlatform; };

     

       1673
        
           }

     

       1674
        
         else if stdenv.hostPlatform.isLinux then

     

       1675
        
           callPackage ../stdenv/linux/make-bootstrap-tools.nix {}

     
···

       17730
        
                       [(

     

       17731
        
                         { lib, ... }: {

     

       17732
        
                           config.nixpkgs.pkgs = lib.mkDefault pkgs;

     

       17733
       +
                           config.nixpkgs.localSystem = lib.mkDefault ({ config = lib.systems.parse.tripleFromSystem stdenv.hostPlatform; });

     

       17734
        
                         }

     

       17735
        
                       )] ++ (

     

       17736
        
                         if builtins.isList configuration

+12 -11

pkgs/top-level/default.nix

···

       46
        
         ...

     

       47
        
       } @ args:

     

       48
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       49
        
       let # Rename the function arguments

     

       50
        
         config0 = config;

     

       51
        
         crossSystem0 = crossSystem;

     
···

       122
        
         config = lib.showWarnings configEval.config.warnings configEval.config;

     

       123
        
       

     

       124
        
         # A few packages make a new package set to draw their dependencies from.

     

       125
       -
         # (Currently to get a cross tool chain, or forced-i686 package.) Rather than

     

       126
       -
         # give `all-packages.nix` all the arguments to this function, even ones that

     

       127
       -
         # don't concern it, we give it this function to "re-call" nixpkgs, inheriting

     

       128
       -
         # whatever arguments it doesn't explicitly provide. This way,

     

       129
       -
         # `all-packages.nix` doesn't know more than it needs too.

     

       130
        
         #

     

       131
        
         # It's OK that `args` doesn't include default arguments from this file:

     

       132
        
         # they'll be deterministically inferred. In fact we must *not* include them,

     

       133
        
         # because it's important that if some parameter which affects the default is

     

       134
        
         # substituted with a different argument, the default is re-inferred.

     

       135
        
         #

     

       136
       -
         # To put this in concrete terms, this function is basically just used today to

     

       137
       -
         # use package for a different platform for the current platform (namely cross

     

       138
       -
         # compiling toolchains and 32-bit packages on x86_64). In both those cases we

     

       139
       -
         # want the provided non-native `localSystem` argument to affect the stdenv

     

       140
       -
         # chosen.

     

       141
        
         #

     

       142
        
         # NB!!! This thing gets its `config` argument from `args`, i.e. it's actually

     

       143
        
         # `config0`. It is important to keep it to `config0` format (as opposed to the

     
···

       146
        
         # via `evalModules` is not idempotent. In other words, if you add `config` to

     

       147
        
         # `newArgs`, expect strange very hard to debug errors! (Yes, I'm speaking from

     

       148
        
         # experience here.)

     

       149
       -
         nixpkgsFun = newArgs: import ./. (args // newArgs);

     

       150
        
       

     

       151
        
         # Partially apply some arguments for building bootstraping stage pkgs

     

       152
        
         # sets. Only apply arguments which no stdenv would want to override.

···

       46
        
         ...

     

       47
        
       } @ args:

     

       48
        
       

     

       49
       +
       # Passing fully elaborated systems to localSystem or crossSystem will break composability

     

       50
       +
       # of package sets.

     

       51
       +
       assert builtins.isAttrs localSystem -> !(localSystem ? parsed);

     

       52
       +
       assert builtins.isAttrs crossSystem -> !(crossSystem ? parsed);

     

       53
       +
       

     

       54
        
       let # Rename the function arguments

     

       55
        
         config0 = config;

     

       56
        
         crossSystem0 = crossSystem;

     
···

       127
        
         config = lib.showWarnings configEval.config.warnings configEval.config;

     

       128
        
       

     

       129
        
         # A few packages make a new package set to draw their dependencies from.

     

       130
       +
         # Rather than give `all-packages.nix` all the arguments to this function,

     

       131
       +
         # even ones that don't concern it, we give it this function to "re-call"

     

       132
       +
         # nixpkgs, inheriting whatever arguments it doesn't explicitly provide. This

     

       133
       +
         # way, `all-packages.nix` doesn't know more than it needs to.

     

       0
        
       
     

       134
        
         #

     

       135
        
         # It's OK that `args` doesn't include default arguments from this file:

     

       136
        
         # they'll be deterministically inferred. In fact we must *not* include them,

     

       137
        
         # because it's important that if some parameter which affects the default is

     

       138
        
         # substituted with a different argument, the default is re-inferred.

     

       139
        
         #

     

       140
       +
         # To put this in concrete terms, we want the provided non-native `localSystem`

     

       141
       +
         # and `crossSystem` arguments to affect the stdenv chosen.

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       142
        
         #

     

       143
        
         # NB!!! This thing gets its `config` argument from `args`, i.e. it's actually

     

       144
        
         # `config0`. It is important to keep it to `config0` format (as opposed to the

     
···

       147
        
         # via `evalModules` is not idempotent. In other words, if you add `config` to

     

       148
        
         # `newArgs`, expect strange very hard to debug errors! (Yes, I'm speaking from

     

       149
        
         # experience here.)

     

       150
       +
         nixpkgsFun = f0: import ./. (args // f0 args);

     

       151
        
       

     

       152
        
         # Partially apply some arguments for building bootstraping stage pkgs

     

       153
        
         # sets. Only apply arguments which no stdenv would want to override.

pkgs/top-level/python-packages.nix

···

       2592
        
       

     

       2593
        
         compressed-rtf = callPackage ../development/python-modules/compressed-rtf { };

     

       2594
        
       

     

       0
        
       
     

       0
        
       
     

       2595
        
         concurrent-log-handler = callPackage ../development/python-modules/concurrent-log-handler { };

     

       2596
        
       

     

       2597
        
         conda = callPackage ../development/python-modules/conda { };

     
···

       8292
        
       

     

       8293
        
         mistletoe = callPackage ../development/python-modules/mistletoe { };

     

       8294
        
       

     

       0
        
       
     

       0
        
       
     

       8295
        
         mistune = callPackage ../development/python-modules/mistune { };

     

       8296
        
       

     

       8297
        
         mitmproxy = callPackage ../development/python-modules/mitmproxy { };

     
···

       10105
        
         parsy = callPackage ../development/python-modules/parsy { };

     

       10106
        
       

     

       10107
        
         partd = callPackage ../development/python-modules/partd { };

     

       0
        
       
     

       0
        
       
     

       10108
        
       

     

       10109
        
         parts = callPackage ../development/python-modules/parts { };

     

       10110

···

       2592
        
       

     

       2593
        
         compressed-rtf = callPackage ../development/python-modules/compressed-rtf { };

     

       2594
        
       

     

       2595
       +
         compressed-tensors = callPackage ../development/python-modules/compressed-tensors { };

     

       2596
       +
       

     

       2597
        
         concurrent-log-handler = callPackage ../development/python-modules/concurrent-log-handler { };

     

       2598
        
       

     

       2599
        
         conda = callPackage ../development/python-modules/conda { };

     
···

       8294
        
       

     

       8295
        
         mistletoe = callPackage ../development/python-modules/mistletoe { };

     

       8296
        
       

     

       8297
       +
         mistral-common = callPackage ../development/python-modules/mistral-common { };

     

       8298
       +
       

     

       8299
        
         mistune = callPackage ../development/python-modules/mistune { };

     

       8300
        
       

     

       8301
        
         mitmproxy = callPackage ../development/python-modules/mitmproxy { };

     
···

       10109
        
         parsy = callPackage ../development/python-modules/parsy { };

     

       10110
        
       

     

       10111
        
         partd = callPackage ../development/python-modules/partd { };

     

       10112
       +
       

     

       10113
       +
         partial-json-parser = callPackage ../development/python-modules/partial-json-parser { };

     

       10114
        
       

     

       10115
        
         parts = callPackage ../development/python-modules/parts { };

     

       10116

+83 -123

pkgs/top-level/stage.nix

···

       180
        
             ((config.packageOverrides or (super: {})) super);

     

       181
        
       

     

       182
        
         # Convenience attributes for instantitating package sets. Each of

     

       183
       -
         # these will instantiate a new version of allPackages. Currently the

     

       184
       -
         # following package sets are provided:

     

       185
       -
         #

     

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

     

       187
       -
         # - pkgsMusl

     

       188
       -
         # - pkgsi686Linux

     

       189
       -
         otherPackageSets = self: super: {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

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

     

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

     

       192
        
           # that target system. For instance, pkgsCross.raspberryPi.hello,

     

       193
        
           # will refer to the "hello" package built for the ARM6-based

     

       194
        
           # Raspberry Pi.

     

       195
        
           pkgsCross = lib.mapAttrs (n: crossSystem:

     

       196
       -
                                     nixpkgsFun { inherit crossSystem; })

     

       197
        
                                     lib.systems.examples;

     

       198
        
       

     

       199
       -
           pkgsLLVM = nixpkgsFun {

     

       200
       -
             overlays = [

     

       201
       -
               (self': super': {

     

       202
       -
                 pkgsLLVM = super';

     

       203
       -
               })

     

       204
       -
             ] ++ overlays;

     

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

     

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

     

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

     

       208
       -
             crossSystem = stdenv.hostPlatform // {

     

       209
       -
               useLLVM = true;

     

       210
       -
               linker = "lld";

     

       211
       -
             };

     

       212
        
           };

     

       213
        
       

     

       214
       -
           pkgsLLVMLibc = nixpkgsFun {

     

       215
       -
             overlays = [ (self': super': {

     

       216
       -
               pkgsLLVMLibc = super';

     

       217
       -
             })] ++ overlays;

     

       218
       -
             # Bootstrap a cross stdenv using LLVM libc.

     

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

     

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

     

       221
       -
             crossSystem = stdenv.hostPlatform // {

     

       222
       -
               config = lib.systems.parse.tripleFromSystem (makeLLVMParsedPlatform stdenv.hostPlatform.parsed);

     

       223
       -
               libc = "llvm";

     

       224
       -
             };

     

       225
        
           };

     

       226
        
       

     

       227
       -
           pkgsArocc = nixpkgsFun {

     

       228
       -
             overlays = [

     

       229
       -
               (self': super': {

     

       230
       -
                 pkgsArocc = super';

     

       231
       -
               })

     

       232
       -
             ] ++ overlays;

     

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

     

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

     

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

     

       236
       -
             crossSystem = stdenv.hostPlatform // {

     

       237
       -
               useArocc = true;

     

       238
       -
               linker = "lld";

     

       239
       -
             };

     

       240
        
           };

     

       241
        
       

     

       242
       -
           pkgsZig = nixpkgsFun {

     

       243
       -
             overlays = [

     

       244
       -
               (self': super': {

     

       245
       -
                 pkgsZig = super';

     

       246
       -
               })

     

       247
       -
             ] ++ overlays;

     

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

     

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

     

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

     

       251
       -
             crossSystem = stdenv.hostPlatform // {

     

       252
       -
               useZig = true;

     

       253
       -
               linker = "lld";

     

       254
       -
             };

     

       255
        
           };

     

       256
        
       

     

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

     

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

     

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

     

       260
       -
           pkgsMusl = if stdenv.hostPlatform.isLinux && stdenv.buildPlatform.is64bit then nixpkgsFun {

     

       261
       -
             overlays = [ (self': super': {

     

       262
       -
               pkgsMusl = super';

     

       263
       -
             })] ++ overlays;

     

       264
       -
             ${if stdenv.hostPlatform == stdenv.buildPlatform

     

       265
       -
               then "localSystem" else "crossSystem"} = {

     

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

     

       267
       -
             };

     

       268
        
           } else throw "Musl libc only supports 64-bit Linux systems.";

     

       269
        
       

     

       270
        
           # All packages built for i686 Linux.

     

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

     

       272
       -
           pkgsi686Linux = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86 then nixpkgsFun {

     

       273
       -
             overlays = [ (self': super': {

     

       274
       -
               pkgsi686Linux = super';

     

       275
       -
             })] ++ overlays;

     

       276
       -
             ${if stdenv.hostPlatform == stdenv.buildPlatform

     

       277
       -
               then "localSystem" else "crossSystem"} = {

     

       278
       -
               config = lib.systems.parse.tripleFromSystem (stdenv.hostPlatform.parsed // {

     

       279
       -
                 cpu = lib.systems.parse.cpuTypes.i686;

     

       280
       -
               });

     

       281
       -
             };

     

       282
        
           } else throw "i686 Linux package set can only be used with the x86 family.";

     

       283
        
       

     

       284
        
           # x86_64-darwin packages for aarch64-darwin users to use with Rosetta for incompatible packages

     

       285
       -
           pkgsx86_64Darwin = if stdenv.hostPlatform.isDarwin then nixpkgsFun {

     

       286
       -
             overlays = [ (self': super': {

     

       287
       -
               pkgsx86_64Darwin = super';

     

       288
       -
             })] ++ overlays;

     

       289
       -
             localSystem = {

     

       290
       -
               config = lib.systems.parse.tripleFromSystem (stdenv.hostPlatform.parsed // {

     

       291
       -
                 cpu = lib.systems.parse.cpuTypes.x86_64;

     

       292
       -
               });

     

       293
       -
             };

     

       294
        
           } else throw "x86_64 Darwin package set can only be used on Darwin systems.";

     

       295
        
       

     

       296
        
           # If already linux: the same package set unaltered

     

       297
       -
           # Otherwise, return a natively built linux package set for the current cpu architecture string.

     

       298
        
           # (ABI and other details will be set to the default for the cpu/os pair)

     

       299
        
           pkgsLinux =

     

       300
        
             if stdenv.hostPlatform.isLinux

     

       301
        
             then self

     

       302
       -
             else nixpkgsFun {

     

       303
       -
               localSystem = lib.systems.elaborate "${stdenv.hostPlatform.parsed.cpu.name}-linux";

     

       304
        
             };

     

       305
        
       

     

       306
       -
           # Extend the package set with zero or more overlays. This preserves

     

       307
       -
           # preexisting overlays. Prefer to initialize with the right overlays

     

       308
       -
           # in one go when calling Nixpkgs, for performance and simplicity.

     

       309
       -
           appendOverlays = extraOverlays:

     

       310
       -
             if extraOverlays == []

     

       311
       -
             then self

     

       312
       -
             else nixpkgsFun { overlays = args.overlays ++ extraOverlays; };

     

       313
       -
       

     

       314
       -
           # NOTE: each call to extend causes a full nixpkgs rebuild, adding ~130MB

     

       315
       -
           #       of allocations. DO NOT USE THIS IN NIXPKGS.

     

       316
       -
           #

     

       317
       -
           # Extend the package set with a single overlay. This preserves

     

       318
       -
           # preexisting overlays. Prefer to initialize with the right overlays

     

       319
       -
           # in one go when calling Nixpkgs, for performance and simplicity.

     

       320
       -
           # Prefer appendOverlays if used repeatedly.

     

       321
       -
           extend = f: self.appendOverlays [f];

     

       322
       -
       

     

       323
        
           # Fully static packages.

     

       324
        
           # Currently uses Musl on Linux (couldn’t get static glibc to work).

     

       325
       -
           pkgsStatic = nixpkgsFun ({

     

       326
       -
             overlays = [ (self': super': {

     

       327
       -
               pkgsStatic = super';

     

       328
       -
             })] ++ overlays;

     

       329
       -
             crossSystem = {

     

       330
       -
               isStatic = true;

     

       331
       -
               config = lib.systems.parse.tripleFromSystem (

     

       332
       -
                 if stdenv.hostPlatform.isLinux

     

       333
       -
                 then makeMuslParsedPlatform stdenv.hostPlatform.parsed

     

       334
       -
                 else stdenv.hostPlatform.parsed

     

       335
       -
               );

     

       336
       -
               gcc = lib.optionalAttrs (stdenv.hostPlatform.system == "powerpc64-linux") { abi = "elfv2"; } //

     

       337
       -
                 stdenv.hostPlatform.gcc or {};

     

       338
       -
             };

     

       339
        
           });

     

       340
        
       

     

       341
       -
           pkgsExtraHardening = nixpkgsFun {

     

       342
        
             overlays = [

     

       343
        
               (self': super': {

     

       344
       -
                 pkgsExtraHardening = super';

     

       345
        
                 stdenv = super'.withDefaultHardeningFlags (

     

       346
        
                   super'.stdenv.cc.defaultHardeningFlags ++ [

     

       347
        
                     "shadowstack"

     
···

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

     

       361
        
                 pcre16 = super'.pcre16.override { enableJit = false; };

     

       362
        
               })

     

       363
       -
             ] ++ overlays;

     

       364
       -
           };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       365
        
         };

     

       366
        
       

     

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

···

       180
        
             ((config.packageOverrides or (super: {})) super);

     

       181
        
       

     

       182
        
         # Convenience attributes for instantitating package sets. Each of

     

       183
       +
         # these will instantiate a new version of allPackages.

     

       184
       +
         otherPackageSets = let

     

       185
       +
           mkPkgs = name: fn: nixpkgsFun (prevArgs: let nixpkgsArgs = fn prevArgs; in nixpkgsArgs // {

     

       186
       +
             overlays = [

     

       187
       +
               (self': super': {

     

       188
       +
                 "${name}" = super';

     

       189
       +
               })

     

       190
       +
             ] ++ nixpkgsArgs.overlays or [] ++ prevArgs.overlays or [];

     

       191
       +
           });

     

       192
       +
           # This is always cross.

     

       193
       +
           mkCrossPkgs = name: crossAttrs: mkPkgs name (prevArgs: {

     

       194
       +
             crossSystem =

     

       195
       +
               (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // crossAttrs;

     

       196
       +
           });

     

       197
       +
           # This is only cross when we are already cross, otherwise local.

     

       198
       +
           # For the case of "native cross", i.e. pkgsCross.gnu64 on a x86_64-linux system, we need to adjust **both**

     

       199
       +
           # localSystem **and** crossSystem, otherwise they're out of sync.

     

       200
       +
           mkHybridPkgs = name: hybridAttrs: mkPkgs name (prevArgs: let

     

       201
       +
               newSystem = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // hybridAttrs;

     

       202
       +
             in { crossSystem = newSystem; }

     

       203
       +
             // lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform) { localSystem = newSystem; }

     

       204
       +
           );

     

       205
       +
         in self: super: {

     

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

     

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

     

       208
        
           # that target system. For instance, pkgsCross.raspberryPi.hello,

     

       209
        
           # will refer to the "hello" package built for the ARM6-based

     

       210
        
           # Raspberry Pi.

     

       211
        
           pkgsCross = lib.mapAttrs (n: crossSystem:

     

       212
       +
                                     nixpkgsFun (prevArgs: { crossSystem = (lib.systems.systemToAttrs (lib.defaultTo { } prevArgs.crossSystem or null)) // crossSystem; }))

     

       213
        
                                     lib.systems.examples;

     

       214
        
       

     

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

     

       216
       +
           # This is currently not possible when compiling natively.

     

       217
       +
           pkgsLLVM = mkCrossPkgs "pkgsLLVM" {

     

       218
       +
             useLLVM = true;

     

       219
       +
             linker = "lld";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       220
        
           };

     

       221
        
       

     

       222
       +
           # Bootstrap a cross stdenv using LLVM libc.

     

       223
       +
           # This is currently not possible when compiling natively.

     

       224
       +
           pkgsLLVMLibc = mkCrossPkgs "pkgsLLVMLibc" {

     

       225
       +
             config = lib.systems.parse.tripleFromSystem (makeLLVMParsedPlatform stdenv.hostPlatform.parsed);

     

       226
       +
             libc = "llvm";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       227
        
           };

     

       228
        
       

     

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

     

       230
       +
           # This is currently not possible when compiling natively.

     

       231
       +
           pkgsArocc = mkCrossPkgs "pkgsArocc" {

     

       232
       +
             useArocc = true;

     

       233
       +
             linker = "lld";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       234
        
           };

     

       235
        
       

     

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

     

       237
       +
           # This is currently not possible when compiling natively.

     

       238
       +
           pkgsZig = mkCrossPkgs "pkgsZig" {

     

       239
       +
             useZig = true;

     

       240
       +
             linker = "lld";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       241
        
           };

     

       242
        
       

     

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

     

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

     

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

     

       246
       +
           pkgsMusl = if stdenv.hostPlatform.isLinux && stdenv.buildPlatform.is64bit then mkHybridPkgs "pkgsMusl" {

     

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

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       248
        
           } else throw "Musl libc only supports 64-bit Linux systems.";

     

       249
        
       

     

       250
        
           # All packages built for i686 Linux.

     

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

     

       252
       +
           pkgsi686Linux = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86 then mkHybridPkgs "pkgsi686Linux" {

     

       253
       +
             config = lib.systems.parse.tripleFromSystem (stdenv.hostPlatform.parsed // {

     

       254
       +
               cpu = lib.systems.parse.cpuTypes.i686;

     

       255
       +
             });

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       256
        
           } else throw "i686 Linux package set can only be used with the x86 family.";

     

       257
        
       

     

       258
        
           # x86_64-darwin packages for aarch64-darwin users to use with Rosetta for incompatible packages

     

       259
       +
           pkgsx86_64Darwin = if stdenv.hostPlatform.isDarwin then mkHybridPkgs "pkgsx86_64Darwin" {

     

       260
       +
             config = lib.systems.parse.tripleFromSystem (stdenv.hostPlatform.parsed // {

     

       261
       +
               cpu = lib.systems.parse.cpuTypes.x86_64;

     

       262
       +
             });

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       263
        
           } else throw "x86_64 Darwin package set can only be used on Darwin systems.";

     

       264
        
       

     

       265
        
           # If already linux: the same package set unaltered

     

       266
       +
           # Otherwise, return a linux package set for the current cpu architecture string.

     

       267
        
           # (ABI and other details will be set to the default for the cpu/os pair)

     

       268
        
           pkgsLinux =

     

       269
        
             if stdenv.hostPlatform.isLinux

     

       270
        
             then self

     

       271
       +
             else mkHybridPkgs "pkgsLinux" {

     

       272
       +
               config = lib.systems.parse.tripleFromSystem (lib.systems.elaborate "${stdenv.hostPlatform.parsed.cpu.name}-linux").parsed;

     

       273
        
             };

     

       274
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       275
        
           # Fully static packages.

     

       276
        
           # Currently uses Musl on Linux (couldn’t get static glibc to work).

     

       277
       +
           pkgsStatic = mkCrossPkgs "pkgsStatic" ({

     

       278
       +
             isStatic = true;

     

       279
       +
           } // lib.optionalAttrs stdenv.hostPlatform.isLinux {

     

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

     

       281
       +
           } // lib.optionalAttrs (stdenv.hostPlatform.system == "powerpc64-linux") {

     

       282
       +
             gcc = { abi = "elfv2"; } // stdenv.hostPlatform.gcc or {};

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       283
        
           });

     

       284
        
       

     

       285
       +
           pkgsExtraHardening = mkPkgs "pkgsExtraHardening" (_: {

     

       286
        
             overlays = [

     

       287
        
               (self': super': {

     

       0
        
       
     

       288
        
                 stdenv = super'.withDefaultHardeningFlags (

     

       289
        
                   super'.stdenv.cc.defaultHardeningFlags ++ [

     

       290
        
                     "shadowstack"

     
···

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

     

       304
        
                 pcre16 = super'.pcre16.override { enableJit = false; };

     

       305
        
               })

     

       306
       +
             ];

     

       307
       +
           });

     

       308
       +
       

     

       309
       +
           # Extend the package set with zero or more overlays. This preserves

     

       310
       +
           # preexisting overlays. Prefer to initialize with the right overlays

     

       311
       +
           # in one go when calling Nixpkgs, for performance and simplicity.

     

       312
       +
           appendOverlays = extraOverlays:

     

       313
       +
             if extraOverlays == []

     

       314
       +
             then self

     

       315
       +
             else nixpkgsFun (prevArgs: { overlays = prevArgs.overlays ++ extraOverlays; });

     

       316
       +
       

     

       317
       +
           # NOTE: each call to extend causes a full nixpkgs rebuild, adding ~130MB

     

       318
       +
           #       of allocations. DO NOT USE THIS IN NIXPKGS.

     

       319
       +
           #

     

       320
       +
           # Extend the package set with a single overlay. This preserves

     

       321
       +
           # preexisting overlays. Prefer to initialize with the right overlays

     

       322
       +
           # in one go when calling Nixpkgs, for performance and simplicity.

     

       323
       +
           # Prefer appendOverlays if used repeatedly.

     

       324
       +
           extend = f: self.appendOverlays [f];

     

       325
        
         };

     

       326
        
       

     

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