commit fac5f2721d1c86f6b3b4eadf0d297939dee6f5ea · pyrox.dev/nixpkgs

+1 -1

lib/tests/release.nix

···

       2
       2
        
         # Don't test properties of pkgs.lib, but rather the lib in the parent directory

     

       3
       3
        
         pkgs ? import ../.. {} // { lib = throw "pkgs.lib accessed, but the lib tests should use nixpkgs' lib path directly!"; },

     

       4
       4
        
         nix ? pkgs-nixVersions.stable,

     

       5
       5
       -
         nixVersions ? [ pkgs-nixVersions.minimum nix pkgs-nixVersions.unstable ],

     

       5
       5
       +
         nixVersions ? [ pkgs-nixVersions.minimum nix pkgs-nixVersions.latest ],

     

       6
       6
        
         pkgs-nixVersions ? import ./nix-for-tests.nix { inherit pkgs; },

     

       7
       7
        
       }:

     

       8
       8

nixos/doc/manual/release-notes/rl-2405.section.md

···

       30
       30
        
       

     

       31
       31
        
         To disable this, set [nixpkgs.flake.setNixPath](#opt-nixpkgs.flake.setNixPath) and [nixpkgs.flake.setFlakeRegistry](#opt-nixpkgs.flake.setFlakeRegistry) to false.

     

       32
       32
        
       

     

       33
       33
       +
       - `nixVersions.unstable` was removed. Instead the following attributes are provided:

     

       34
       34
       +
         - `nixVersions.git` which tracks the latest Nix master and is roughly updated once a week. This is intended to enable people to easily test unreleased changes of Nix to catch regressions earlier.

     

       35
       35
       +
         - `nixVersions.latest` which points to the latest Nix version packaged in nixpkgs.

     

       36
       36
       +
       

     

       33
       37
        
       - Julia environments can now be built with arbitrary packages from the ecosystem using the `.withPackages` function. For example: `julia.withPackages ["Plots"]`.

     

       34
       38
        
       

     

       35
       39
        
       - The PipeWire and WirePlumber modules have removed support for using

+1 -1

pkgs/development/tools/language-servers/nil/default.nix

···

       14
       14
        
         cargoHash = "sha256-lyKPmzuZB9rCBI9JxhxlyDtNHLia8FXGnSgV+D/dwgo=";

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [

     

       17
       17
       -
           (lib.getBin nixVersions.unstable)

     

       17
       17
       +
           (lib.getBin nixVersions.latest)

     

       18
       18
        
         ];

     

       19
       19
        
       

     

       20
       20
        
         env.CFG_RELEASE = version;

+16 -2

pkgs/tools/package-management/nix/default.nix

···

       179
       179
        
           hash = "sha256-Ugcc+lSq8nJP+mddMlGFnoG4Ix1lRFHWOal3299bqR8=";

     

       180
       180
        
         };

     

       181
       181
        
       

     

       182
       182
       +
         git = common rec {

     

       183
       183
       +
           version = "2.23.0";

     

       184
       184
       +
           suffix = "pre20240426_${lib.substring 0 8 src.rev}";

     

       185
       185
       +
           src = fetchFromGitHub {

     

       186
       186
       +
             owner = "NixOS";

     

       187
       187
       +
             repo = "nix";

     

       188
       188
       +
             rev = "2f678331d59451dd6f1d9512cb6d92e4ecb9750f";

     

       189
       189
       +
             hash = "sha256-4AwaLB/gTRgvZG4FmFY6OY52yeLAnj0a6rtJCz7TRXA=";

     

       190
       190
       +
           };

     

       191
       191
       +
         };

     

       192
       192
       +
       

     

       193
       193
       +
         latest = self.nix_2_21;

     

       194
       194
       +
       

     

       182
       195
        
         # The minimum Nix version supported by Nixpkgs

     

       183
       196
        
         # Note that some functionality *might* have been backported into this Nix version,

     

       184
       197
        
         # making this package an inaccurate representation of what features are available

     
···

       197
       210
        
             nix;

     

       198
       211
        
       

     

       199
       212
        
         stable = addFallbackPathsCheck self.nix_2_18;

     

       200
       200
       -
       

     

       201
       201
       -
         unstable = self.nix_2_22;

     

       202
       213
        
       } // lib.optionalAttrs config.allowAliases (

     

       203
       214
        
         lib.listToAttrs (map (

     

       204
       215
        
           minor:

     
···

       207
       218
        
           in

     

       208
       219
        
           lib.nameValuePair attr (throw "${attr} has been removed")

     

       209
       220
        
         ) (lib.range 4 17))

     

       221
       221
       +
         // {

     

       222
       222
       +
           unstable = throw "nixVersions.unstable has been removed. For bleeding edge (Nix master, roughly weekly updated) use nixVersions.git, otherwise use nixVersions.latest.";

     

       223
       223
       +
         }

     

       210
       224
        
       )))

+53 -13

pkgs/tools/package-management/nix/nix-perl.nix

···

       9
       9
        
       , autoreconfHook

     

       10
       10
        
       , autoconf-archive

     

       11
       11
        
       , nlohmann_json

     

       12
       12
       +
       , xz

     

       12
       13
        
       , Security

     

       14
       14
       +
       , meson

     

       15
       15
       +
       , ninja

     

       16
       16
       +
       , bzip2

     

       13
       17
        
       }:

     

       14
       18
        
       

     

       15
       15
       -
       stdenv.mkDerivation {

     

       19
       19
       +
       let

     

       20
       20
       +
         atLeast223 = lib.versionAtLeast nix.version "2.23";

     

       21
       21
       +
       

     

       22
       22
       +
         mkConfigureOption = { mesonOption, autoconfOption, value }:

     

       23
       23
       +
           let

     

       24
       24
       +
             setFlagTo = if atLeast223

     

       25
       25
       +
               then lib.mesonOption mesonOption

     

       26
       26
       +
               else lib.withFeatureAs true autoconfOption;

     

       27
       27
       +
           in

     

       28
       28
       +
           setFlagTo value;

     

       29
       29
       +
       in stdenv.mkDerivation (finalAttrs: {

     

       16
       30
        
         pname = "nix-perl";

     

       17
       31
        
         inherit (nix) version src;

     

       18
       32
        
       

     

       19
       33
        
         postUnpack = "sourceRoot=$sourceRoot/perl";

     

       20
       34
        
       

     

       21
       21
       -
         buildInputs = lib.optional (stdenv.isDarwin) Security;

     

       22
       22
       -
       

     

       23
       23
       -
         # This is not cross-compile safe, don't have time to fix right now

     

       24
       24
       -
         # but noting for future travellers.

     

       25
       25
       -
         nativeBuildInputs = [

     

       26
       26
       -
           autoconf-archive

     

       27
       27
       -
           autoreconfHook

     

       35
       35
       +
         buildInputs = [

     

       28
       36
        
           boost

     

       37
       37
       +
           bzip2

     

       29
       38
        
           curl

     

       30
       39
        
           libsodium

     

       31
       40
        
           nix

     

       32
       32
       -
           nlohmann_json

     

       33
       41
        
           perl

     

       42
       42
       +
           xz

     

       43
       43
       +
         ] ++ lib.optional (stdenv.isDarwin) Security;

     

       44
       44
       +
       

     

       45
       45
       +
         # Not cross-safe since Nix checks for curl/perl via

     

       46
       46
       +
         # NEED_PROG/find_program, but both seem to be needed at runtime

     

       47
       47
       +
         # as well.

     

       48
       48
       +
         nativeBuildInputs = [

     

       34
       49
        
           pkg-config

     

       50
       50
       +
           perl

     

       51
       51
       +
           curl

     

       52
       52
       +
         ] ++ (if atLeast223 then [

     

       53
       53
       +
           meson

     

       54
       54
       +
           ninja

     

       55
       55
       +
         ] else [

     

       56
       56
       +
           autoconf-archive

     

       57
       57
       +
           autoreconfHook

     

       58
       58
       +
         ]);

     

       59
       59
       +
       

     

       60
       60
       +
         # `perlPackages.Test2Harness` is marked broken for Darwin

     

       61
       61
       +
         doCheck = !stdenv.isDarwin;

     

       62
       62
       +
       

     

       63
       63
       +
         nativeCheckInputs = [

     

       64
       64
       +
           perl.pkgs.Test2Harness

     

       35
       65
        
         ];

     

       36
       66
        
       

     

       37
       37
       -
         configureFlags = [

     

       38
       38
       -
           "--with-dbi=${perl.pkgs.DBI}/${perl.libPrefix}"

     

       39
       39
       -
           "--with-dbd-sqlite=${perl.pkgs.DBDSQLite}/${perl.libPrefix}"

     

       67
       67
       +
         ${if atLeast223 then "mesonFlags" else "configureFlags"} = [

     

       68
       68
       +
           (mkConfigureOption {

     

       69
       69
       +
             mesonOption = "dbi_path";

     

       70
       70
       +
             autoconfOption = "dbi";

     

       71
       71
       +
             value = "${perl.pkgs.DBI}/${perl.libPrefix}";

     

       72
       72
       +
           })

     

       73
       73
       +
           (mkConfigureOption {

     

       74
       74
       +
             mesonOption = "dbd_sqlite_path";

     

       75
       75
       +
             autoconfOption = "dbd-sqlite";

     

       76
       76
       +
             value = "${perl.pkgs.DBDSQLite}/${perl.libPrefix}";

     

       77
       77
       +
           })

     

       78
       78
       +
         ] ++ lib.optionals atLeast223 [

     

       79
       79
       +
           (lib.mesonEnable "tests" finalAttrs.doCheck)

     

       40
       80
        
         ];

     

       41
       81
        
       

     

       42
       82
        
         preConfigure = "export NIX_STATE_DIR=$TMPDIR";

     

       43
       43
       -
       }

     

       83
       83
       +
       })