Sergei Zimmerman
dadb5b01b7
libstore/registerOutputs: Don't try to optimize a non-existent actualPath
...
Since 3c610df550 this resulted in `getting status of`
errors on paths inside the chroot if a path was already valid. Careful inspection
of the logic shows that if buildMode != bmCheck actualPath gets reassigned to
store.toRealPath(finalDestPath). The only branch that cares about actualPath is
the buildMode == bmCheck case, which doesn't lead to optimisePath anyway.
(cherry picked from commit 4cbcaad435 )
2025-10-16 21:46:08 +00:00
internal-nix-ci[bot]
3c39583e55
Merge pull request #14267 from NixOS/backport-14263-to-2.32-maintenance
...
[Backport 2.32-maintenance] Restore `ServeProto::Command::ImportPaths`
2025-10-16 00:07:32 +00:00
Sergei Zimmerman
a038c92d38
Restore ServeProto::Command::ImportPaths
...
This partially reverts commit 5e46df973f ,
partially reversing changes made to
8c789db05b .
We do this because Hydra, while using the newer version of the protocol,
still uses this command, even though Nix (as a client) doesn't use it.
On that basis, we don't want to remove it (or consider it only part of
the older versions of the protocol) until Hydra no longer uses the
Legacy SSH Protocol.
(cherry picked from commit 0deb492b3d )
2025-10-15 23:38:26 +00:00
internal-nix-ci[bot]
cf6ad228ae
Merge pull request #14259 from NixOS/backport-14253-to-2.32-maintenance
...
[Backport 2.32-maintenance] libfetchers/git-utils: Be more correct about validating refnames
2025-10-15 20:33:35 +00:00
Sergei Zimmerman
44701007b4
libfetchers/git-utils: Be more correct about validating refnames
...
Turns out there's a much better API for this that doesn't have the
footguns of the previous method.
isLegalRefName is somewhat of a misnomer, since it's mainly used to
validate user inputs that can be either references, branch names,
psedorefs or tags.
(cherry picked from commit 5d1178b817 )
2025-10-15 20:08:43 +00:00
internal-nix-ci[bot]
ff1f145992
Merge pull request #14256 from NixOS/backport-14205-to-2.32-maintenance
...
[Backport 2.32-maintenance] Improved backwards compatibility hack for git URLs using dir=...
2025-10-15 16:31:21 +00:00
Graham Dennis
3519ad2ca6
Improve comment
...
(cherry picked from commit 8d9e9bc400 )
2025-10-15 15:58:18 +00:00
Graham Dennis
16af6a8ed1
Improved backwards compatibility hack for git URLs using dir=... attribute
...
(cherry picked from commit 43b01b6790 )
2025-10-15 15:58:18 +00:00
Eelco Dolstra
549a2e8272
Bump version
2025-10-14 11:26:39 +02:00
internal-nix-ci[bot]
2531dcad75
Merge pull request #14238 from NixOS/backport-14237-to-2.32-maintenance
...
[Backport 2.32-maintenance] Remove validation of URLs passed to FileTransferRequest verbatim
2025-10-13 21:23:05 +00:00
Sergei Zimmerman
11f9c59140
Remove validation of URLs passed to FileTransferRequest verbatim
...
CURL is not very strict about validation of URLs passed to it. We
should reflect this in our handling of URLs that we get from the user
in <nix/fetchurl.nix> or builtins.fetchurl. ValidURL was an attempt to
rectify this, but it turned out to be too strict. The only good way to
resolve this is to pass (in some cases) the user-provided string verbatim
to CURL. Other usages in libfetchers still benefit from using structured
ParsedURL and validation though.
nix store prefetch-file --name foo 'https://cdn.skypack.dev/big.js @^5.2.2'
error: 'https://cdn.skypack.dev/big.js @^5.2.2' is not a valid URL: leftover
(cherry picked from commit 47f427a172 )
2025-10-13 20:48:15 +00:00
internal-nix-ci[bot]
a25a219e79
Merge pull request #14213 from NixOS/backport-14194-to-2.32-maintenance
...
[Backport 2.32-maintenance] libutil: Print stack trace on assertion failure
2025-10-11 00:40:50 +00:00
Sergei Zimmerman
f07486b205
libutil: Print stack trace on assertion failure
...
This change overrides __assert_fail on glibc/musl
to instead call std::terminate that we have a custom
handler for. This ensures that we have more context
to diagnose issues encountered by users in the wild.
(cherry picked from commit 46382ade74 )
2025-10-11 00:08:36 +00:00
internal-nix-ci[bot]
9ec98f7844
Merge pull request #14212 from NixOS/backport-14210-to-2.32-maintenance
...
[Backport 2.32-maintenance] libstore: Fix double-quoting of paths in logs
2025-10-10 23:26:18 +00:00
Sergei Zimmerman
634e1d3b65
libstore: Fix double-quoting of paths in logs
...
std::filesystem::path is already quoted by boost::format with double quotes (").
(cherry picked from commit f30cb8667b )
2025-10-10 22:54:22 +00:00
internal-nix-ci[bot]
70655061e3
Merge pull request #14202 from NixOS/backport-14199-to-2.32-maintenance
...
[Backport 2.32-maintenance] packaging: only override `toml11` when necessary
2025-10-09 18:04:05 +00:00
Seth Flynn
da328e6004
packaging: only override toml11 when necessary
...
v4.4.0 hit Nixpkgs in https://github.com/NixOS/nixpkgs/pull/442682 .
Ideally we'd just use that, but this keeps the fallback behavior until
it's more widespread
(cherry picked from commit 0f016f9bf5 )
2025-10-09 17:56:10 +00:00
internal-nix-ci[bot]
6b16af8c0e
Merge pull request #14197 from NixOS/backport-14191-to-2.32-maintenance
...
[Backport 2.32-maintenance] libutil: Fix renderAuthorityAndPath unreachable for path:/ URLs
2025-10-09 00:00:28 +00:00
internal-nix-ci[bot]
010b78e0cf
Merge pull request #14196 from NixOS/backport-14189-to-2.32-maintenance
...
[Backport 2.32-maintenance] exportReferencesGraph: Handle heterogeneous arrays
2025-10-08 23:43:51 +00:00
Sergei Zimmerman
98b7654390
libutil: Fix renderAuthorityAndPath unreachable for path:/ URLs
...
This was mistakenly triggered by path:/ URL, since the `//` would
correspond to 3 empty segments.
(cherry picked from commit 1d8dd77e1d )
2025-10-08 23:24:01 +00:00
Eelco Dolstra
c5799aa62c
exportReferencesGraph: Handle heterogeneous arrays
...
This barfed with
error: [json.exception.type_error.302] type must be string, but is array
on `nix build github:malt3/bazel-env#bazel-env` because it has a `exportReferencesGraph` with a value like `["string",...["string"]]`.
(cherry picked from commit 94f410b628 )
2025-10-08 23:13:09 +00:00
Eelco Dolstra
72e3dd396c
Bump version
2025-10-07 17:14:49 +02:00
Eelco Dolstra
d069633b3d
Mark official release
2025-10-07 13:30:16 +02:00
Eelco Dolstra
6c21c810b9
Merge pull request #14164 from NixOS/release-notes
...
Release notes for Nix 2.32
2025-10-07 12:48:53 +02:00
John Ericson
eea6d75783
Merge pull request #14168 from xokdvium/nar-require-contents
...
libutil: Throw if `str("contents")` not found
2025-10-06 19:39:26 -04:00
Samuel Connelly
242f362567
libutil: Throw if str("contents") not found
...
This was broken in 7aa3e7e3a5 (since 2.25).
2025-10-07 01:04:49 +03:00
Sergei Zimmerman
0068ee6ca7
Release note for attrset optimization
2025-10-06 22:16:21 +03:00
Eelco Dolstra
1e709554d5
Merge pull request #14050 from NixOS/fix-fetch-to-store-caching
...
Fix fetchToStore caching
2025-10-06 19:39:41 +02:00
Eelco Dolstra
8f71ef7ede
Update doc/manual/source/release-notes/rl-2.32.md
...
Co-authored-by: Taeer Bar-Yam <Radvendii@users.noreply.github.com>
2025-10-06 19:27:30 +02:00
Eelco Dolstra
8142989e67
Merge pull request #14166 from lovesegfault/nix-rl-notes
...
docs(release-notes): note fix for fetchTarball/fetchurl substitution
2025-10-06 19:11:18 +02:00
Bernardo Meurer Costa
776038f842
docs(release-notes): note fix for fetchTarball/fetchurl substitution
2025-10-06 17:09:34 +00:00
Eelco Dolstra
f4e44040d4
Release note for external derivation builders
2025-10-06 16:26:29 +02:00
Eelco Dolstra
0376112a51
Organize release notes
2025-10-06 16:11:24 +02:00
Eelco Dolstra
c1761b867b
Contributors
2025-10-06 16:11:15 +02:00
Eelco Dolstra
9f6ed70429
release notes: 2.32.0
2025-10-06 16:04:58 +02:00
Eelco Dolstra
35b3557fe4
Merge pull request #14162 from NixOS/fix-windows-build
...
Don't build getPtsName() on Windows
2025-10-06 14:55:39 +02:00
Eelco Dolstra
8aa0acb9e8
Don't build getPtsName() on Windows
...
It's not needed.
https://hydra.nixos.org/build/309215536
2025-10-06 13:26:36 +02:00
Eelco Dolstra
5e65584edf
Merge pull request #14145 from NixOS/external-derivation-builder
...
External derivation builders
2025-10-06 12:13:01 +02:00
Eelco Dolstra
e7e2ac97f8
Merge remote-tracking branch 'origin/master' into external-derivation-builder
2025-10-06 11:40:56 +02:00
Eelco Dolstra
e9c5d721d8
ExternalDerivationBuilder: Emit a version field
2025-10-06 11:36:26 +02:00
Eelco Dolstra
68bd2e40f4
ExternalDerivationBuilder: Pass the (scratch) outputs
2025-10-06 11:33:29 +02:00
Eelco Dolstra
6c0d67769d
ExternalDerivationBuilder: Pass inputPaths
2025-10-06 11:29:15 +02:00
Eelco Dolstra
e5ae81c21a
Merge pull request #14158 from fzakaria/fzakaria/small-clang-tidy-fix
...
clang-tidy fix for src/libstore/build/derivation-check.cc
2025-10-06 11:11:48 +02:00
Sergei Zimmerman
d5fa131cfb
Merge pull request #14161 from Radvendii/exprophasattr-alloc
...
libexpr: fixup ExprOpHasAttr() to take allocator reference
2025-10-05 22:49:17 +00:00
Taeer Bar-Yam
14b119c948
libexpr: fixup ExprOpHasAttr() to take allocator reference
2025-10-05 18:28:47 -04:00
Sergei Zimmerman
29f3da1305
Merge branch 'master' into fzakaria/small-clang-tidy-fix
2025-10-05 21:27:39 +00:00
John Ericson
34bca9212a
Merge pull request #14156 from NixOS/fix-ub
...
treewide: Squash some user-after-free bugs
2025-10-05 16:49:22 -04:00
John Ericson
cd9c208baf
Merge pull request #14159 from NixOS/revert-resolution-goal
...
Revert #14097 , #14022
2025-10-05 16:28:33 -04:00
Sergei Zimmerman
ce749454dc
Revert "Merge pull request #14022 from obsidiansystems/derivation-resolution-goal"
...
This reverts commit d02dca099f , reversing
changes made to 9bd09155ac .
2025-10-05 21:54:59 +03:00
Sergei Zimmerman
7e39ab4dc7
Revert "Merge pull request #14097 from obsidiansystems/light-realisation-improvements"
...
This reverts commit dc8c1461da , reversing
changes made to 28adcfda32 .
2025-10-05 21:54:32 +03:00