pyrox.dev
lol
Merge pull request #181625 from lovesegfault/nix-2.10.3
nix: 2.10.2 -> 2.10.3
authored by
Bernardo Meurer
and committed by
GitHub
ed0e38f2
606231af
+9
-7
+5
-5
nixos/modules/installer/tools/nix-fallback-paths.nix
+5
-5
nixos/modules/installer/tools/nix-fallback-paths.nix
···
1
1
{
2
-
x86_64-linux = "/nix/store/qx384jvdjk2vzd2wpr9pmkcimk12g3as-nix-2.10.2";
3
-
i686-linux = "/nix/store/8mhknp6flnlnbj11zmskb3972ia1mdl5-nix-2.10.2";
4
-
aarch64-linux = "/nix/store/digzqw2vgdsg0fdzf7qlwbl4xii9i458-nix-2.10.2";
5
-
x86_64-darwin = "/nix/store/w62jxmpvjykw707qr9s5nxi90r35xqmd-nix-2.10.2";
6
-
aarch64-darwin = "/nix/store/6pjrn22f57n854x88a9kkbqnxw1yai73-nix-2.10.2";
2
+
x86_64-linux = "/nix/store/3af6g226v4hsv6x7xzh23d6wqyq0nzjp-nix-2.10.3";
3
+
i686-linux = "/nix/store/43xxh2jip6rpdhylc5z9a5fxx54dw206-nix-2.10.3";
4
+
aarch64-linux = "/nix/store/6qw3r57nra08ars8j8zyj3fl8lz4cvnd-nix-2.10.3";
5
+
x86_64-darwin = "/nix/store/3b7qrm0qjw57fmznrsvm0ai568i89hc2-nix-2.10.3";
6
+
aarch64-darwin = "/nix/store/gp7k17iy1n7hgf97qwnxw28c6v9nhb1i-nix-2.10.3";
7
7
}
+2
pkgs/tools/package-management/nix/common.nix
+2
pkgs/tools/package-management/nix/common.nix
···
167
167
] ++ lib.optionals (!withLibseccomp) [
168
168
# RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50
169
169
"--disable-seccomp-sandboxing"
170
+
] ++ lib.optionals (atLeast210 && stdenv.cc.isGNU && !enableStatic) [
171
+
"--enable-lto"
170
172
];
171
173
172
174
makeFlags = [
+2
-2
pkgs/tools/package-management/nix/default.nix
+2
-2
pkgs/tools/package-management/nix/default.nix