nixVersions.nix_2_26: Move source.json to parameter
This commit is contained in:
committed by
Jörg Thalheim
parent
b3e4affac6
commit
6b1e3742ec
@@ -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`.
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
{
|
||||
"owner": "NixOS",
|
||||
"repo": "nix",
|
||||
"rev": "42fc03dd1f12df2d9152303f3fb8bf22b746462c",
|
||||
"hash": "sha256-5ZV8YqU8mfFmoAMiUEuBqNwk0T3vUR//x1D12BiYCeY="
|
||||
}
|
||||
Reference in New Issue
Block a user