From 979709b036191c51868f831b54be798086f57e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 21 Sep 2023 22:05:20 +0200 Subject: [PATCH 1/3] nixVersions.nix_2_18: init --- pkgs/tools/package-management/nix/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index a6f0ac7be39e..2917cfdd9eb5 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -191,6 +191,11 @@ in lib.makeExtensible (self: ({ hash = "sha256-QMYAkdtU+g9HlZKtoJ+AI6TbWzzovKGnPZJHfZdclc8="; }; + nix_2_18 = common { + version = "2.18.0"; + hash = "sha256-ggISAuGpTkKp6JXt1BbcLtLDYOPECWqrVnPVgQEFHYc="; + }; + # The minimum Nix version supported by Nixpkgs # Note that some functionality *might* have been backported into this Nix version, # making this package an inaccurate representation of what features are available From 13ec86514d2de921a7bbc7324416152a8889c061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 21 Sep 2023 22:08:59 +0200 Subject: [PATCH 2/3] nixVersions.unstable: 2.17 -> 2.18 --- 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 2917cfdd9eb5..2a7810a977b9 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -215,7 +215,7 @@ in lib.makeExtensible (self: ({ stable = self.nix_2_17; - unstable = self.stable; + unstable = self.nix_2_18; } // lib.optionalAttrs config.allowAliases { nix_2_4 = throw "nixVersions.nix_2_4 has been removed"; From 00a343b1b189e9f276b57ebc8b82bf89b135ed1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 22 Sep 2023 01:16:04 +0200 Subject: [PATCH 3/3] harmonia: unpin nix unstable --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee436c759b8d..97be3f184073 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9097,9 +9097,7 @@ with pkgs; hardinfo = callPackage ../tools/system/hardinfo { }; - harmonia = callPackage ../tools/package-management/harmonia { - nix = nixVersions.unstable; - }; + harmonia = callPackage ../tools/package-management/harmonia { }; hayagriva = callPackage ../tools/typesetting/hayagriva { };