From 1df2988b3675815f708f34fdcaf7cabbf47afc3a Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 20 Dec 2021 14:42:30 +0100 Subject: [PATCH 1/5] nix_2_5: init at 2.5.1 --- pkgs/tools/package-management/nix/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 19 insertions(+) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 59651c973c37..6ea797ef1cb8 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -258,6 +258,24 @@ in rec { 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_nixUnstable; + + patches = [ installNlohmannJsonPatch ]; + + inherit storeDir stateDir confDir; + }); + nixUnstable = lib.lowPrio (callPackage common rec { pname = "nix"; version = "2.5${suffix}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b157891b92cc..3fea47d87bd2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32675,6 +32675,7 @@ with pkgs; nixStable nix_2_3 nix_2_4 + nix_2_5 nixUnstable; nixStatic = pkgsStatic.nix; From 379292e8f1cd29c92b05c7eb93942e2b4b77cda6 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 20 Dec 2021 14:45:16 +0100 Subject: [PATCH 2/5] nix: 2.4 -> 2.5.1 --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 6ea797ef1cb8..238e4d914139 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -225,7 +225,7 @@ in rec { nix = nixStable; - nixStable = nix_2_4; + nixStable = nix_2_5; nix_2_3 = callPackage common (rec { pname = "nix"; From 90b4ae600ea459de2340be62891d79b269890249 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 20 Dec 2021 14:48:02 +0100 Subject: [PATCH 3/5] nix: Refactor --- pkgs/tools/package-management/nix/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 238e4d914139..ac47bc9df68b 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -200,11 +200,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 { @@ -235,7 +235,7 @@ in rec { sha256 = "sha256-fuaBtp8FtSVJLSAsO+3Nne4ZYLuBj2JpD2xEk7fCqrw="; }; - boehmgc = boehmgc_nix; + boehmgc = boehmgc_nix_2_3; inherit storeDir stateDir confDir; }); @@ -251,7 +251,7 @@ in rec { sha256 = "sha256-op48CCDgLHK0qV1Batz4Ln5FqBiRjlE6qHTiZgt3b6k="; }; - boehmgc = boehmgc_nixUnstable; + boehmgc = boehmgc_nix; patches = [ installNlohmannJsonPatch ]; @@ -269,7 +269,7 @@ in rec { sha256 = "sha256-GOsiqy9EaTwDn2PLZ4eFj1VkXcBUbqrqHehRE9GuGdU="; }; - boehmgc = boehmgc_nixUnstable; + boehmgc = boehmgc_nix; patches = [ installNlohmannJsonPatch ]; @@ -288,7 +288,7 @@ in rec { sha256 = "sha256-zdMODMLdJ0smEEzNMOoIzBxt9QWVzgMvr+pwxkhtD4g="; }; - boehmgc = boehmgc_nixUnstable; + boehmgc = boehmgc_nix; patches = [ installNlohmannJsonPatch ]; From 9848c378ed3df76a2ccb4c8be9f131c1635371e6 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 20 Dec 2021 15:01:12 +0100 Subject: [PATCH 4/5] nix: Remove redundant derivation attrs These cause unnecessary rebuilds when a new series is added and exposing them as package attributes looks convenient but is not sustainable. --- pkgs/tools/package-management/nix/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index ac47bc9df68b..0fdcbd384b91 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -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; From 11f136d71481f100d76f816f6354b3d4b39bf607 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 20 Dec 2021 17:50:44 +0100 Subject: [PATCH 5/5] nix-eval-jobs: 0.0.1 -> 0.0.2 --- pkgs/tools/package-management/nix-eval-jobs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index a9cf1238441c..fbab464afd6b 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -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