Commit Graph

1197 Commits

Author SHA1 Message Date
nixpkgs-ci[bot]
f66de93f85 Merge staging-next into staging 2026-08-13 18:18:57 +00:00
zowoq
9b88fef0ad nixVersions.nix_2_35: 2.35.1 -> 2.35.2
Diff: https://github.com/NixOS/nix/compare/2.35.1...2.35.2
2026-08-13 10:47:56 +10:00
Yifei Sun
0e2ae96228 nixVersions.git: 2.35pre20260619 -> 2.36pre20260804 2026-08-05 16:38:08 +02:00
Ben Siraphob
f7379a5aec pkgs/tools: fix typos
Assisted-by: Claude Code (claude-opus-5)
2026-08-02 11:15:27 -07:00
Emily
b31d2f0465 nix: clean up after x86_64-darwin drop 2026-07-15 03:58:17 +01:00
夜坂雅
f6ec6d2e35 nixVersions.latest: 2.34.8 -> 2.35.1 2026-07-14 10:02:57 +08:00
Sergei Zimmerman
88b362d977 nixVersions.nix_2_34: 2.34.7 -> 2.34.8
Notably, this has the fix for libcurl 8.21 and wakeup consumption.

Diff: https://github.com/NixOS/nix/compare/2.34.7...2.34.8
2026-07-06 23:56:10 +03:00
nixpkgs-ci[bot]
a7c22a4263 Merge master into staging-next 2026-07-02 18:32:15 +00:00
SandaruKasa
6ccc5ac3f2 nix: meta: add changelog 2026-07-01 23:15:13 +03:00
nixpkgs-ci[bot]
d8a7dfa41f Merge master into staging-next 2026-06-30 00:44:58 +00:00
Jörg Thalheim
75f3bb55be nixVersions.nix_2_30: remove
Nix 2.30 is no longer maintained upstream and was the last consumer of
the lowdown 3.0 backport patch.
2026-06-28 20:50:47 +03:00
Jörg Thalheim
7d940ca082 nixVersions.nix_2_28: remove
Nix 2.28 was the last release packaged with the monolithic
common-meson.nix expression and is no longer maintained upstream.
Drop it together with the now-unused common-meson.nix and nix-perl.nix
helpers and the storeDir/stateDir/confDir plumbing that only fed
that code path.
2026-06-28 20:50:31 +03:00
nixpkgs-ci[bot]
2d05f94a89 Merge staging-next into staging 2026-06-24 00:41:00 +00:00
Yifei Sun
40b1d13a21 nix: cleanup unused lowdown patch 2026-06-19 09:17:52 +02:00
Yifei Sun
c57d288273 nix: comment out unwanted tests directly in src
in https://github.com/NixOS/nixpkgs/pull/532575
we were using hardcoded line numbers to disable tests
and the patch might not apply if upstream source
reordered the tests or added/removed entries

instead we added `removeFunctionalTests` helper to
directly comment out those lines in meson.build file
2026-06-19 09:17:41 +02:00
Yifei Sun
b8541f163a nixVersions.git: 2.35pre20260504 -> 2.35pre20260619 2026-06-19 09:16:14 +02:00
Philip Taron
f4366bc68d pkgsMusl.nix: fix build (#491447) 2026-06-10 17:18:12 +00:00
nixpkgs-ci[bot]
d644c92282 Merge staging-next into staging 2026-06-01 19:39:24 +00:00
Ethan Carter Edwards
9313f44ca7 nix*: set meta.donationPage
Good software is worth supporting.

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
2026-06-01 00:50:42 -07:00
Morgan Jones
a74e4f1c48 nix: remove util-linux test special-casing
Fixed-by: https://lore.kernel.org/util-linux/dryjs4vfzzysrhuxa4khf7frezdmouv6ys5nqsx7u46nvk4mg6@z4o37akcrh6y/T/#u
2026-05-18 11:43:50 -07:00
John Ericson
b5d02e8fc7 nix: fix withMimalloc (#516347) 2026-05-14 01:31:50 +00:00
zowoq
8d35362651 nix: fix withMimalloc
fixes d22a182395
2026-05-14 10:14:52 +10:00
Ben Siraphob
869d641281 treewide: replace stdenv.is* with stdenv.hostPlatform.is* 2026-05-10 10:06:35 -07:00
zowoq
58b06ea575 nixVersions.git: 2.35pre20260503 -> 2.35pre20260504 2026-05-05 08:42:58 +10:00
Robert Hensing
1e8579c66d nix: bump 2.28.6 -> 2.28.7, 2.30.4 -> 2.30.5, 2.31.4 -> 2.31.5 (#516612) 2026-05-04 20:22:13 +00:00
Jörg Thalheim
b17c2cfdb3 nix: bump 2.28.6 -> 2.28.7, 2.30.4 -> 2.30.5, 2.31.4 -> 2.31.5
Update source hashes for new patch releases.
2026-05-04 21:28:12 +02:00
Jörg Thalheim
070d5328c8 nix: 2.34.6 -> 2.34.7
Update source hash and fallback paths for the new release.
2026-05-04 20:58:28 +02:00
zowoq
b39581da47 nixVersions.git: 2.35pre20260407 -> 2.35pre20260503 2026-05-04 16:19:48 +10:00
zowoq
a21f98fabc nixVersions.nixComponents_2_34.nix-util-tests: disable failing test
seems to consistently fail in GHA
2026-04-30 22:28:33 +10:00
K900
48a8193e0b Merge remote-tracking branch 'origin/master' into staging-next 2026-04-14 23:11:24 +03:00
Robert Hensing
a3a6c03f0a nix-functional-tests: move env variables into env for structuredAttrs (#508281) 2026-04-14 17:38:17 +00:00
nixpkgs-ci[bot]
f1faf73ddd Merge master into staging-next 2026-04-14 12:22:36 +00:00
Philip Taron
0ca69b0650 nix: fix nix-store-tests-run for static builds
The test runner's buildInputs (writableTmpDirAsHomeHook, openssl)
need to be nativeBuildInputs. In the static (cross-musl) build,
strictDeps is enabled and only nativeBuildInputs are added to PATH.
With buildInputs, openssl was not in PATH, causing
HttpsBinaryCacheStoreTest.queryPathInfo to crash.
2026-04-12 14:50:44 -07:00
Philip Taron
924e5a22c7 nixVersions.stable: nix_2_31 -> nix_2_34 2026-04-12 14:50:38 -07:00
nixpkgs-ci[bot]
ddc9c24645 Merge master into staging-next 2026-04-12 12:12:42 +00:00
zowoq
33fa3264c6 nixVersions.nix_2_34: 2.34.5 -> 2.34.6
Diff: https://github.com/NixOS/nix/compare/2.34.5...2.34.6
2026-04-12 20:55:52 +10:00
nixpkgs-ci[bot]
ed5803a2ab Merge master into staging-next 2026-04-11 12:11:38 +00:00
Sergei Zimmerman
0233beda0f nix: add throw aliases for the removed 2.33 and 2.34
This was missed when initially dropping the package sets.
2026-04-11 14:37:55 +03:00
Stefan Frijters
d691a9929e nix-functional-tests: nix fmt 2026-04-09 13:15:16 +02:00
Stefan Frijters
4cc131092c nix-functional-tests: move env variables into env for structuredAttrs 2026-04-09 13:13:40 +02:00
K900
a585d9e2d3 nix-functional-tests: nixfmt 2026-04-08 14:37:10 +03:00
K900
64d65a80f2 nix-functional-tests: skip test broken by util-linux regression 2026-04-08 13:12:42 +03:00
Jörg Thalheim
d22a182395 nixVersions.git: 2026-03-28 -> 2026-04-07
Master already contains the GHSA-g3g9-5vj6-r3gj sandbox escape fix and
the landlock abstract socket hardening, so drop the now-redundant
downstream backports.
2026-04-07 22:33:13 +02:00
Jörg Thalheim
36341693fa nixVersions.nix_2_28: 2.28.5 -> 2.28.6
The 2.28.6 tarball already contains the mdbook 0.5 compatibility fix
and the GHSA-g3g9-5vj6-r3gj sandbox escape fix, so drop the
now-redundant downstream backports.
2026-04-07 22:33:13 +02:00
Jörg Thalheim
123da37985 nixVersions.nix_2_34: 2.34.4 -> 2.34.5
The 2.34.5 tarball already contains the GHSA-g3g9-5vj6-r3gj sandbox
escape fix and the landlock abstract socket hardening, so drop the
now-redundant downstream backports.
2026-04-07 22:33:13 +02:00
Jörg Thalheim
83250692a8 nixVersions.nix_2_31: 2.31.3 -> 2.31.4
The 2.31.4 tarball already contains the lowdown 3.0 compatibility fix,
the GHSA-g3g9-5vj6-r3gj sandbox escape fix and the landlock abstract
socket hardening, so drop the now-redundant downstream backports.
2026-04-07 22:33:13 +02:00
Jörg Thalheim
b368cceed7 nixVersions.nix_2_30: 2.30.3 -> 2.30.4
The 2.30.4 tarball already contains the mdbook 0.5, lowdown 3.0 and
GHSA-g3g9-5vj6-r3gj fixes that were previously backported downstream,
so drop the now-redundant patches.
2026-04-07 22:33:13 +02:00
Jörg Thalheim
50eec35e48 nixComponents_git: add patches for GHSA-g3g9-5vj6-r3gj
This addresses GHSA-g3g9-5vj6-r3gj, a vulnerability where
std::filesystem::copy_file follows symlinks when copying FOD outputs,
allowing a malicious builder to overwrite files outside the build
sandbox.

The patch puts FOD output copies in a temporary directory inside the
store (instead of the chroot) and tightens permissions on the
in-store temporary directory.

The second patch partially fixes the issue with cooperating processes being able
to communicate via abstract sockets. The fix is partial, because processes
outside the landlock domain of the sandboxed process can still connect to
a socket created by the FOD. There's no equivalent way of restricting inbound
connections. This closes the gap when there's no cooperating process on the host
(i.e. 2 separate FODs).

The patch applies landlock LANDLOCK_SCOPE_ABSTRACT_UNIX_SOCKET on
kernels >= 6.12 (default on NixOS 25.11+) to deny abstract socket
connect from inside the build sandbox.
2026-04-07 20:52:46 +03:00
Jörg Thalheim
7ca89c4ab6 nixComponents_2_34: add patches for GHSA-g3g9-5vj6-r3gj
This addresses GHSA-g3g9-5vj6-r3gj, a vulnerability where
std::filesystem::copy_file follows symlinks when copying FOD outputs,
allowing a malicious builder to overwrite files outside the build
sandbox.

The patch puts FOD output copies in a temporary directory inside the
store (instead of the chroot) and tightens permissions on the
in-store temporary directory.

The second patch partially fixes the issue with cooperating processes being able
to communicate via abstract sockets. The fix is partial, because processes
outside the landlock domain of the sandboxed process can still connect to
a socket created by the FOD. There's no equivalent way of restricting inbound
connections. This closes the gap when there's no cooperating process on the host
(i.e. 2 separate FODs).

The patch applies landlock LANDLOCK_SCOPE_ABSTRACT_UNIX_SOCKET on
kernels >= 6.12 (default on NixOS 25.11+) to deny abstract socket
connect from inside the build sandbox.
2026-04-07 20:52:00 +03:00
Jörg Thalheim
be23129938 nixComponents_2_31: add patches for GHSA-g3g9-5vj6-r3gj
This addresses GHSA-g3g9-5vj6-r3gj, a vulnerability where
std::filesystem::copy_file follows symlinks when copying FOD outputs,
allowing a malicious builder to overwrite files outside the build
sandbox.

The patch puts FOD output copies in a temporary directory inside the
store (instead of the chroot) and tightens permissions on the
in-store temporary directory.

The second patch partially fixes the issue with cooperating processes being able
to communicate via abstract sockets. The fix is partial, because processes
outside the landlock domain of the sandboxed process can still connect to
a socket created by the FOD. There's no equivalent way of restricting inbound
connections. This closes the gap when there's no cooperating process on the host
(i.e. 2 separate FODs).

The patch applies landlock LANDLOCK_SCOPE_ABSTRACT_UNIX_SOCKET on
kernels >= 6.12 (default on NixOS 25.11+) to deny abstract socket
connect from inside the build sandbox.
2026-04-07 20:51:01 +03:00