Luc Perkins
29cbee6eb8
Fix merge conflicts with main
2025-06-02 10:54:23 -07:00
Luc Perkins
7ef7619657
Finish initial draft
2025-06-02 10:45:23 -07:00
Eelco Dolstra
57ee710b73
Merge pull request #83 from DeterminateSystems/deletePath-keep-going-detsys
...
deletePath(): Keep going when encountering an undeletable file
2025-06-02 15:42:16 +00:00
Eelco Dolstra
665e76f2e5
deletePath(): Keep going when encountering an undeletable file
...
This should reduce the impact of #5207 .
2025-06-02 17:17:09 +02:00
Eelco Dolstra
03f3faf150
Merge pull request #82 from DeterminateSystems/graham/fh-834-fix-missing-command-nix-store-query-deriver
...
Document how to replicate nix-store --query --deriver with the nix cli
2025-06-02 15:07:59 +00:00
Graham Christensen
1647cb56c1
Document how to replicate nix-store --query --deriver with the nix command
2025-06-02 10:47:27 -04:00
Graham Christensen
44bdb74c62
Merge pull request #80 from DeterminateSystems/copy-sigs
...
nix store copy-sigs: Use http-connections setting to control parallelism
2025-06-02 10:26:04 +00:00
Eelco Dolstra
b16fa06ff1
nix store copy-sigs: Add docs
2025-06-02 12:06:21 +02:00
Eelco Dolstra
0278b9e180
nix store copy-sigs: Use http-connections setting to control parallelism
...
Previously it used the `ThreadPool` default,
i.e. `std:🧵 :hardware_concurrency()`. But copying signatures is
not primarily CPU-bound so it makes more sense to use the
`http-connections` setting (since we're typically copying from/to a
binary cache).
2025-06-02 11:44:16 +02:00
Eelco Dolstra
8ff43c29ef
Merge pull request #76 from DeterminateSystems/improve-trace-ifd-test
...
Fix trace-ifd test failure in dev shell
2025-05-26 12:15:32 +00:00
Eelco Dolstra
5f13d13f78
Fix trace-ifd test failure in dev shell
...
Fixes
error: cannot create symlink '/home/eelco/Dev/nix/tests/functional/flakes/result'; already exists
running the test multiple times in a dev shell.
2025-05-26 13:56:38 +02:00
Graham Christensen
047584d03b
Merge pull request #74 from DeterminateSystems/release-v3.6.1/228e087a-ae02-45c0-8bd9-756a89d31008
...
Release v3.6.1
2025-05-24 03:28:04 +00:00
Graham Christensen
4e08d4a917
Merge pull request #72 from DeterminateSystems/gustavderdrache/system-builderror
...
Make platform checks throw BuildError like other failures
2025-05-24 02:14:21 +00:00
github-actions[bot]
3e0433b65d
Generare release notes for 3.6.1
2025-05-24 02:11:10 +00:00
github-actions[bot]
20a79d9a73
Set .version-determinate to 3.6.1
2025-05-24 02:11:05 +00:00
github-actions[bot]
8e4f7984d1
Prepare release v3.6.1
2025-05-24 02:11:02 +00:00
Eelco Dolstra
ac7fd9d711
Merge pull request #73 from DeterminateSystems/fix-substitution-crash-detsys
...
Fix nlohmann error in fromStructuredAttrs()
2025-05-23 23:22:07 +00:00
gustavderdrache
562ed80bb7
Update src/libstore/unix/build/derivation-builder.cc
...
Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
2025-05-23 18:58:37 -04:00
Eelco Dolstra
4bc1043ae4
Add test
2025-05-24 00:46:37 +02:00
Eelco Dolstra
af7bfe7827
fromStructuredAttrs(): Don't crash if exportReferencesGraph is a string
...
Fixes
error: [json.exception.type_error.302] type must be array, but is string
and other crashes.
Fixes #13254 .
2025-05-24 00:46:37 +02:00
Eelco Dolstra
09d46ad93a
Don't use 'callback' object that we may have moved out of
2025-05-24 00:46:37 +02:00
gustavderdrache
61c3efb4f4
Make platform checks throw BuildError like other failures
2025-05-23 17:40:02 -04:00
Graham Christensen
8cd9eb86ad
Merge pull request #71 from DeterminateSystems/release-v3.6.0/97cc9af4-6a23-49f0-a8e9-190390c2f020
...
Release v3.6.0
2025-05-22 23:43:13 +00:00
Graham Christensen
486fca34bc
Apply suggestions from code review
2025-05-22 19:36:08 -04:00
github-actions[bot]
e5e7c2797c
Generare release notes for 3.6.0
2025-05-22 23:29:04 +00:00
github-actions[bot]
a43997cce4
Set .version-determinate to 3.6.0
2025-05-22 23:28:59 +00:00
github-actions[bot]
90cb816511
Prepare release v3.6.0
2025-05-22 23:28:56 +00:00
Graham Christensen
f9967792c7
Merge pull request #70 from DeterminateSystems/gustavderdrache/trace-ifd
...
Emit warnings when using import-from-derivation by setting the `trace-import-from-derivation` option to `true`
2025-05-22 22:54:07 +00:00
gustavderdrache
0b66fd3c34
Update src/libexpr/include/nix/expr/eval-settings.hh
...
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
2025-05-22 17:30:14 -04:00
gustavderdrache
4355b7cbd5
Add test for output warning to ensure stability
2025-05-22 17:30:14 -04:00
gustavderdrache
8825cd56b5
Log warnings on IFD with new option
2025-05-22 17:30:14 -04:00
Cole Helbling
ea2f882fb1
Merge pull request #67 from DeterminateSystems/sync-2.29
...
Sync with upstream 2.29.0
2025-05-22 20:10:11 +00:00
Eelco Dolstra
1246506152
Tagging release 2.29.0
...
-----BEGIN PGP SIGNATURE-----
iQFHBAABCAAxFiEEtUHVUwEnDgvPFcpdgXC0cm1xmN4FAmgvHQQTHGVkb2xzdHJh
QGdtYWlsLmNvbQAKCRCBcLRybXGY3qVRCACZ22QWsHqvn6EEROSoSLbAH9/LqLOQ
jvDzVQ3jk+2LznLt+grfaiTP69nL4SmzMjjeRQxGCnKnDNfHyPkxv5ddRJjX0SCA
A89m6Fctas5frtbhmKDnLBx3lwKEFS0sq2qEp4uYUb9hU1gaByaLUbGcUUXQ2P3c
fD1lm0uK/Z9IXY4h3/pyfp7tacYynuO+5E8F1C7T81hc/fA8EUBj6Yof1Ykx/Hg5
Qj+iQ6y1i94XU4Y3SJYy8mjmILdsYNj+ICQ0IYQuWEARTiGZqLfo2uGtSroR5hLy
PqYpqp9whQOpb7PyoQ28A0Gzc43O/MgpHnZO+KjV07SFXeqDnoWdltse
=GWRg
-----END PGP SIGNATURE-----
Merge tag '2.29.0' into sync-2.29
Tagging release 2.29.0
2025-05-22 14:53:09 +02:00
Luc Perkins
a56ecb5302
Add logos
2025-05-20 10:20:14 -04:00
Luc Perkins
607be58a80
Update CI badge URLs
2025-05-19 11:20:40 -04:00
Eelco Dolstra
0cd1fce3c3
Merge pull request #13230 from NixOS/mergify/bp/2.29-maintenance/pr-13228
...
libutil-tests/json-utils: fix -Werror=sign-compare error (backport #13228 )
2025-05-19 16:46:37 +02:00
Jörg Thalheim
90eb2f759c
libutil-tests/json-utils: fix -Werror=sign-compare error
...
I am on a newer different nixpkgs branch, so I am getting this error
(cherry picked from commit 1290b7e53d
2025-05-19 14:16:43 +00:00
Eelco Dolstra
5d7ebaed24
Merge remote-tracking branch 'origin/2.29-maintenance' into sync-2.29
2025-05-19 16:12:55 +02:00
Jörg Thalheim
d1e4be6fb4
Merge pull request #13227 from NixOS/mergify/bp/2.29-maintenance/pr-13142
...
libstore: Use `boost::regex` for GC root discovery (backport #13142 )
2025-05-18 22:26:54 +02:00
Sergei Zimmerman
29d98da636
libstore: Depend on boost_regex explicitly
...
(cherry picked from commit 18a5589f9a
2025-05-18 19:46:17 +00:00
Sergei Zimmerman
91dc6e7fa0
packaging/dependencies: Use boost without enableIcu
...
This reduces the closure size on master by 40MiB.
```
$ nix build github:nixos/nix/1e822bd4149a8bce1da81ee2ad9404986b07914c#nix-store --out-link closure-on-master
$ nix build .#nix-store -L --out-link closure-without-icu
$ nix path-info --closure-size -h ./closure-on-master
/nix/store/8gwr38m5h6p7245ji9jv28a2a11w1isx-nix-store-2.29.0pre 124.4 MiB
$ nix path-info --closure-size -h ./closure-without-icu
/nix/store/k0gwfykjqpnmaqbwh23nk55lhanc9g24-nix-store-2.29.0pre 86.6 MiB
```
(cherry picked from commit f3090ef703
2025-05-18 19:46:17 +00:00
Sergei Zimmerman
b33fd1e4fb
libstore: Use boost::regex for GC root discovery
...
As it turns out using `std::regex` is actually the bottleneck
for root discovery. Just substituting `std::` -> `boost::`
makes root discovery twice as fast (3x if counting only userspace time).
Some rather ad-hoc measurements to motivate the switch:
(On master)
```
nix build github:nixos/nix/1e822bd4149a8bce1da81ee2ad9404986b07914c#nix-cli --out-link result-1e822bd4149a8bce1da81ee2ad9404986b07914c
taskset -c 2,3 hyperfine "result-1e822bd4149a8bce1da81ee2ad9404986b07914c/bin/nix store gc --dry-run --max 0"
Benchmark 1: result-1e822bd4149a8bce1da81ee2ad9404986b07914c/bin/nix store gc --dry-run --max 0
Time (mean ± σ): 481.6 ms ± 3.9 ms [User: 336.2 ms, System: 142.0 ms]
Range (min … max): 474.6 ms … 487.7 ms 10 runs
```
(After this patch)
```
taskset -c 2,3 hyperfine "result/bin/nix store gc --dry-run --max 0"
Benchmark 1: result/bin/nix store gc --dry-run --max 0
Time (mean ± σ): 254.7 ms ± 9.7 ms [User: 111.1 ms, System: 141.3 ms]
Range (min … max): 246.5 ms … 281.3 ms 10 runs
```
`boost::regex` is a drop-in replacement for `std::regex`, but much faster.
Doing a simple before/after comparison doesn't surface any change in behavior:
```
result/bin/nix store gc --dry-run -vvvvv --max 0 |& grep "got additional" | wc -l
result-1e822bd4149a8bce1da81ee2ad9404986b07914c/bin/nix store gc --dry-run -vvvvv --max 0 |& grep "got additional" | wc -l
```
(cherry picked from commit 3a1301cd6d
2025-05-18 19:46:16 +00:00
Eelco Dolstra
8f7ac96bbc
Merge remote-tracking branch 'origin/2.29-maintenance' into sync-2.29
2025-05-18 13:11:12 +02:00
Eelco Dolstra
136cc106e7
Restore the hash mismatch activity
2025-05-18 13:10:08 +02:00
Eelco Dolstra
f50117ba4c
Revert storeFS to use makeFSSourceAccessor()
...
Need to investigate why store->getFSAccessor() breaks a test.
2025-05-18 10:01:57 +02:00
Eelco Dolstra
1d5cce6c5c
Merge pull request #69 from DeterminateSystems/nix-profile-add-manpage
...
Install 'nix profile add' manpage
2025-05-17 21:43:44 +00:00
Eelco Dolstra
83fa99844b
Install 'nix profile add' manpage
2025-05-17 21:19:49 +02:00
mergify[bot]
1c618a9d87
Merge pull request #13222 from NixOS/mergify/bp/2.29-maintenance/pr-13221
...
doc: Render verbatim `@docroot@` on contributing page (backport #13221 )
2025-05-17 18:00:31 +00:00
Robert Hensing
ab2abebfc3
doc: Render verbatim @docroot@ on contributing page
...
In rendered form:
```diff
-Add references to the manual using ..
+Add references to the manual using [links like this](@docroot@/example.md)
```
(cherry picked from commit 147a34c573
2025-05-17 17:19:51 +00:00
Luc Perkins
162e21820d
Merge pull request #68 from DeterminateSystems/determinate-nix-action
...
Switch to determinate-nix-action
2025-05-16 21:14:34 +00:00
