From 6b1e3742ec7ea8ba091819ecd304097fbd63e4b9 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 31 Mar 2025 18:15:06 +0200 Subject: [PATCH] nixVersions.nix_2_26: Move source.json to parameter --- pkgs/tools/package-management/nix/default.nix | 18 +++++++++++------- .../nix/vendor/2_26/componentized.nix | 3 +-- .../nix/vendor/2_26/source.json | 6 ------ 3 files changed, 12 insertions(+), 15 deletions(-) delete mode 100644 pkgs/tools/package-management/nix/vendor/2_26/source.json diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index db52e39ac996..6894c6432052 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -167,13 +167,17 @@ lib.makeExtensible ( self_attribute_name = "nix_2_25"; }; - nixComponents_2_26 = ( - nixDependencies.callPackage ./vendor/2_26/componentized.nix { - version = "2.26.3"; - inherit (self.nix_2_24.meta) maintainers; - otherSplices = generateSplicesForNixComponents "nixComponents_2_26"; - } - ); + nixComponents_2_26 = nixDependencies.callPackage ./vendor/2_26/componentized.nix { + version = "2.26.3"; + inherit (self.nix_2_24.meta) maintainers; + otherSplices = generateSplicesForNixComponents "nixComponents_2_26"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nix"; + rev = "42fc03dd1f12df2d9152303f3fb8bf22b746462c"; + hash = "sha256-5ZV8YqU8mfFmoAMiUEuBqNwk0T3vUR//x1D12BiYCeY="; + }; + }; # Note, this might eventually become an alias, as packages should # depend on the components they need in `nixComponents_2_26`. diff --git a/pkgs/tools/package-management/nix/vendor/2_26/componentized.nix b/pkgs/tools/package-management/nix/vendor/2_26/componentized.nix index 43ed56bc551c..d051dc6d716d 100644 --- a/pkgs/tools/package-management/nix/vendor/2_26/componentized.nix +++ b/pkgs/tools/package-management/nix/vendor/2_26/componentized.nix @@ -1,16 +1,15 @@ { lib, - fetchFromGitHub, splicePackages, nixDependencies, pkgs, maintainers, otherSplices, version, + src, }: let officialRelease = true; - src = fetchFromGitHub (builtins.fromJSON (builtins.readFile ./source.json)); # A new scope, so that we can use `callPackage` to inject our own interdependencies # without "polluting" the top level "`pkgs`" attrset. diff --git a/pkgs/tools/package-management/nix/vendor/2_26/source.json b/pkgs/tools/package-management/nix/vendor/2_26/source.json deleted file mode 100644 index e8070d9b0dd1..000000000000 --- a/pkgs/tools/package-management/nix/vendor/2_26/source.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "owner": "NixOS", - "repo": "nix", - "rev": "42fc03dd1f12df2d9152303f3fb8bf22b746462c", - "hash": "sha256-5ZV8YqU8mfFmoAMiUEuBqNwk0T3vUR//x1D12BiYCeY=" -}