Nix 2.24 upgrade (#343655)
This commit is contained in:
@@ -1,7 +1,8 @@
|
||||
{
|
||||
x86_64-linux = "/nix/store/f409bhlpp0xkzvdz95qr2yvfjfi8r9jc-nix-2.18.5";
|
||||
i686-linux = "/nix/store/ra39jzrxq3bcpf55aahwv5037akvylf5-nix-2.18.5";
|
||||
aarch64-linux = "/nix/store/xiw8a4jbnw18svgdb04hyqzg5bsjspqf-nix-2.18.5";
|
||||
x86_64-darwin = "/nix/store/k2gzx7i90x3h2c8g6xdi1jkwbl6ic895-nix-2.18.5";
|
||||
aarch64-darwin = "/nix/store/rqwymbndaqxma6p8s5brcl9k32n5xx54-nix-2.18.5";
|
||||
x86_64-linux = "/nix/store/s429drnj3jp5dbxib74r3q0rypknvw48-nix-2.24.7";
|
||||
i686-linux = "/nix/store/1ysk63fwjvx4whxqpka1x4lyjb4m5576-nix-2.24.7";
|
||||
aarch64-linux = "/nix/store/8av0avdm2anwmvf9qka02cz093599rw7-nix-2.24.7";
|
||||
riscv64-linux = "/nix/store/b70zcmr3zrd7q569zzpz8dln93d3sx39-nix-riscv64-unknown-linux-gnu-2.24.7";
|
||||
x86_64-darwin = "/nix/store/gba97bmnyrp6x936kr8zqc2mkhcrz1vf-nix-2.24.7";
|
||||
aarch64-darwin = "/nix/store/7mb1mcpmjphg5bgc8m7m0gxrsshrzsk7-nix-2.24.7";
|
||||
}
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
pkg-config,
|
||||
boost,
|
||||
howard-hinnant-date,
|
||||
nix,
|
||||
|
||||
# for tests
|
||||
runCommand,
|
||||
@@ -31,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
boost
|
||||
howard-hinnant-date
|
||||
nix
|
||||
nixVersions.nix_2_18
|
||||
];
|
||||
|
||||
passthru.tests = let
|
||||
|
||||
@@ -2,18 +2,21 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nix-plugins";
|
||||
version = "14.0.0";
|
||||
version = "15.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shlevy";
|
||||
repo = "nix-plugins";
|
||||
rev = version;
|
||||
hash = "sha256-RDKAuLwcZ3Pbn5JUDmGBcfD0xbM6Jud2ouXh/YKpfS8=";
|
||||
hash = "sha256-C4VqKHi6nVAHuXVhqvTRRyn0Bb619ez4LzgUWPH1cbM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ nix boost ];
|
||||
buildInputs = [
|
||||
nix
|
||||
boost
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Collection of miscellaneous plugins for the nix expression language";
|
||||
|
||||
@@ -265,7 +265,7 @@ in lib.makeExtensible (self: ({
|
||||
else
|
||||
nix;
|
||||
|
||||
stable = addFallbackPathsCheck self.nix_2_18;
|
||||
stable = addFallbackPathsCheck self.nix_2_24;
|
||||
} // lib.optionalAttrs config.allowAliases (
|
||||
lib.listToAttrs (map (
|
||||
minor:
|
||||
|
||||
Reference in New Issue
Block a user