Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Nix 2.24 upgrade #343655

Merged
merged 4 commits into from
Sep 22, 2024
Merged

Nix 2.24 upgrade #343655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a94e07
Reapply "nix: nix_2_18 -> nix_2_24"
Mic92 Sep 22, 2024
af7bcfa
nix: update fallback-paths
Mic92 Sep 22, 2024
5385694
Reapply "nix-plugins: 14.0.0 -> 15.0.0"
Mic92 Sep 22, 2024
829636f
nix-plugin-pijul: fix plugins to 2.18
Mic92 Sep 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions nixos/modules/installer/tools/nix-fallback-paths.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
}
3 changes: 1 addition & 2 deletions pkgs/by-name/ni/nix-plugin-pijul/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
pkg-config,
boost,
howard-hinnant-date,
nix,

# for tests
runCommand,
Expand All @@ -31,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
boost
howard-hinnant-date
nix
nixVersions.nix_2_18
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @2xsaiko

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't build with nix 2.24.

];

passthru.tests = let
Expand Down
9 changes: 6 additions & 3 deletions pkgs/development/libraries/nix-plugins/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/tools/package-management/nix/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down