nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 16:03:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #151419 from hercules-ci/update-nix

Browse Source 
nix: 2.4 -> 2.5.1
This commit is contained in:
Bernardo Meurer 2021-12-20 11:40:33 -08:00 committed by GitHub
commit 89f196fe78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/package-management/nix-eval-jobs/default.nix
View File

@ -11,12 +11,12 @@
}:
stdenv.mkDerivation rec {
pname = "nix-eval-jobs";
version = "0.0.1";
version = "0.0.2";
src = fetchFromGitHub {
owner = "nix-community";
repo = pname;
rev = "v${version}";
hash = "sha256-LTMW4356f8pvIyfYdOyZbF9yzU8MH9mryQgB4LrwZMI=";
hash = "sha256-kZw/nPJqWuBMMnDWsWF3oMY93QYVRem1XTbaxdbQ2oM=";
};
buildInputs = [
boost

42
pkgs/tools/package-management/nix/default.nix
View File

@ -31,11 +31,12 @@ common =
}:
let
sh = busybox-sandbox-shell;
nix = stdenv.mkDerivation rec {
inherit pname version src patches;
is24 = lib.versionAtLeast version "2.4pre";
is25 = lib.versionAtLeast version "2.5pre";
is24 = lib.versionAtLeast version "2.4pre";
is25 = lib.versionAtLeast version "2.5pre";
nix = stdenv.mkDerivation {
inherit pname version src patches;
VERSION_SUFFIX = suffix;
@ -173,6 +174,9 @@ common =
};
passthru = {
is24 = lib.warn ''nix package: attribute .is24 is deprecated. Please use lib.versionAtLeast X.version "2.4pre".'' is24;
is25 = lib.warn ''nix package: attribute .is25 is deprecated. Please use lib.versionAtLeast X.version "2.5pre".'' is25;
perl-bindings = perl.pkgs.toPerlModule (stdenv.mkDerivation {
pname = "nix-perl";
inherit version;
@ -200,11 +204,11 @@ common =
};
in nix;
boehmgc_nix = boehmgc.override {
boehmgc_nix_2_3 = boehmgc.override {
enableLargeConfig = true;
};
boehmgc_nixUnstable = boehmgc_nix.overrideAttrs (drv: {
boehmgc_nix = boehmgc_nix_2_3.overrideAttrs (drv: {
patches = (drv.patches or []) ++ [
# Part of the GC solution in https://github.com/NixOS/nix/pull/4944
(fetchpatch {
@ -225,7 +229,7 @@ in rec {
nix = nixStable;
nixStable = nix_2_4;
nixStable = nix_2_5;
nix_2_3 = callPackage common (rec {
pname = "nix";
@ -235,7 +239,7 @@ in rec {
sha256 = "sha256-fuaBtp8FtSVJLSAsO+3Nne4ZYLuBj2JpD2xEk7fCqrw=";
};
boehmgc = boehmgc_nix;
boehmgc = boehmgc_nix_2_3;
inherit storeDir stateDir confDir;
});
@ -251,7 +255,25 @@ in rec {
sha256 = "sha256-op48CCDgLHK0qV1Batz4Ln5FqBiRjlE6qHTiZgt3b6k=";
};
boehmgc = boehmgc_nixUnstable;
boehmgc = boehmgc_nix;
patches = [ installNlohmannJsonPatch ];
inherit storeDir stateDir confDir;
});
nix_2_5 = callPackage common (rec {
pname = "nix";
version = "2.5.1";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = version;
sha256 = "sha256-GOsiqy9EaTwDn2PLZ4eFj1VkXcBUbqrqHehRE9GuGdU=";
};
boehmgc = boehmgc_nix;
patches = [ installNlohmannJsonPatch ];
@ -270,7 +292,7 @@ in rec {
sha256 = "sha256-RZSWOJUPkXIlMNYMC5a+WNrOjpqAHyhzyqD57BGfNY8=";
};
boehmgc = boehmgc_nixUnstable;
boehmgc = boehmgc_nix;
patches = [ installNlohmannJsonPatch ];

1
pkgs/top-level/all-packages.nix
View File

@ -32679,6 +32679,7 @@ with pkgs;
nixStable
nix_2_3
nix_2_4
nix_2_5
nixUnstable;
nixStatic = pkgsStatic.nix;