wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 02:21:16 +02:00
Code Activity
20050 commits 244 branches 205 tags 158 MiB
Commit graph

20050 commits

This branch
This branch
All branches
Author SHA1 Message Date
mergify[bot]
b3b137ec4a
Merge pull request #13392 from NixOS/mergify/bp/2.29-maintenance/pr-13348 
Make the repl test more robust (backport #13348)
 2025-06-22 19:41:08 +00:00
Eelco Dolstra
833406121c Make the repl test more robust 
Seen in 4390954027:

  nix-functional-tests> grep: repl_output: No such file or directory
  nix-functional-tests> +(repl.sh:174) cat repl_output

This is because there is a small possibility that the `nix repl` child
process hasn't created `repl_output` yet. So make sure it exists.

(cherry picked from commit 9eb46e9cc0)
 2025-06-22 19:09:38 +00:00
mergify[bot]
075df0b446
Merge pull request #13380 from NixOS/mergify/bp/2.29-maintenance/pr-13376 
Revert "Drop magic-nix-cache" (backport #13376)
 2025-06-19 12:44:08 +00:00
Eelco Dolstra
2f6c758d3d Revert "Drop magic-nix-cache" 
This reverts commit 9cc8be2674 since
magic-nix-cache works again (thanks @jchv).

(cherry picked from commit 9b57573bae)
 2025-06-19 12:12:28 +00:00
mergify[bot]
4c7e5ce7a8
Merge pull request #13375 from NixOS/mergify/bp/2.29-maintenance/pr-13371 
tests: fixup with jq-1.8.0 (backport #13371)
 2025-06-18 15:51:12 +00:00
Vladimír Čunát
86fbaf3b14 tests: fixup with jq-1.8.0 
(cherry picked from commit 77f6b6532f)
 2025-06-18 15:18:06 +00:00
mergify[bot]
5c3aed3e88
Merge pull request #13330 from NixOS/mergify/bp/2.29-maintenance/pr-13284 
lockFlake(): Allow registry lookups for overridden inputs (backport #13284)
 2025-06-06 08:47:04 +00:00
Seth Flynn
fcdffffa37 lockFlake(): Allow registry lookups for overridden inputs 
Fixes #13144

(cherry picked from commit d0a2323829)
 2025-06-06 08:12:20 +00:00
mergify[bot]
aeb627bebf
Merge pull request #13316 from NixOS/mergify/bp/2.29-maintenance/pr-13296 
Clear `displayPrefix` in `makeEmptySourceAccessor` (backport #13296)
 2025-06-03 18:08:59 +00:00
Sergei Zimmerman
a2567f6d7a Clear displayPrefix in makeEmptySourceAccessor 
Judging by the comment for `makeEmptySourceAccessor` the prefix has
to be empty:

> Return a source accessor that contains only an empty root directory.

Fixes #13295.

(cherry picked from commit fba1bb0c13)
 2025-06-03 19:27:15 +02:00
mergify[bot]
c1e272b47d
Merge pull request #13319 from NixOS/mergify/bp/2.29-maintenance/pr-13274 
Drop magic-nix-cache (backport #13274)
 2025-06-03 14:52:47 +00:00
Eelco Dolstra
cfba4b3bf4 Drop magic-nix-cache 
This no longer works, see https://determinate.systems/posts/magic-nix-cache-free-tier-eol/.

(cherry picked from commit 9cc8be2674)
 2025-06-03 14:18:54 +00:00
mergify[bot]
d761dad79c
Merge pull request #13259 from NixOS/mergify/bp/2.29-maintenance/pr-13256 
Fix nlohmann error in fromStructuredAttrs() (backport #13256)
 2025-05-25 06:35:47 +00:00
Eelco Dolstra
d068b82c2f Add test 
(cherry picked from commit c66eb9cef7)
 2025-05-25 05:55:28 +00:00
Eelco Dolstra
8ca4d2ef08 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.

(cherry picked from commit d877b0c0cc)
 2025-05-25 05:55:27 +00:00
Eelco Dolstra
acc3cd460d Don't use 'callback' object that we may have moved out of 
(cherry picked from commit fa6e10ea6a)
 2025-05-25 05:55:27 +00:00
Eelco Dolstra
c4813b8cbc Bump version 2025-05-22 14:48:51 +02: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
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
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
John Ericson
0f132fc129
Merge pull request #13218 from NixOS/mergify/bp/2.29-maintenance/pr-13212 
docs: remove repeated "allowedReferences" and other lexical illusion (backport #13212)
 2025-05-16 12:36:46 -04:00
Peder Bergebakken Sundt
6fc6db3496 docs: remove lexical illusions detected with write-good 
I made this this non-markdown aware tool somewhat behave with some cursed fd+pandoc invocations

(cherry picked from commit ea5302c4a2)
 2025-05-16 15:56:26 +00:00
Peder Bergebakken Sundt
ca0bde3578 docs: remove repeated "allowedReferences" 
This is what write-good lints as a "lexical illusion"

(cherry picked from commit cb16cd707c)
 2025-05-16 15:56:26 +00:00
mergify[bot]
f51b537239
Merge pull request #13210 from NixOS/mergify/bp/2.29-maintenance/pr-13207 
dev-shell: Drop bear dependency (backport #13207)
 2025-05-15 22:32:16 +00:00
Sergei Zimmerman
2b7e3e9b81 dev-shell: Drop bear dependency 
Since the autotools-based build system has been removed
and meson already generates compile database there's no
need to have it in the devshell.

(cherry picked from commit 67535263a5)
 2025-05-15 21:49:21 +00:00
Jörg Thalheim
fee8454dd0
Merge pull request #13205 from NixOS/mergify/bp/2.29-maintenance/pr-13202 
Fix nix-copy-closure VM test (backport #13202)
 2025-05-15 18:34:32 +02:00
Eelco Dolstra
dc238ba102 Fix nix-copy-closure VM test 
https://hydra.nixos.org/build/297112538
(cherry picked from commit d626348f42)
 2025-05-15 15:51:43 +00:00
mergify[bot]
fa7a5ab07a
Merge pull request #13201 from NixOS/mergify/bp/2.29-maintenance/pr-13197 
Update Nixpkgs to fix static builds (backport #13197)
 2025-05-15 11:48:30 +00:00
Eelco Dolstra
27932ae6da
Merge pull request #13199 from NixOS/mergify/bp/2.29-maintenance/pr-13196 
rename StoreDirConfigItself to StoreDirConfigBase (backport #13196)
 2025-05-15 12:44:09 +02:00
Eelco Dolstra
631d23788e
Merge pull request #13198 from NixOS/mergify/bp/2.29-maintenance/pr-13195 
Remove otherNixes.nix_2_18 (backport #13195)
 2025-05-15 12:24:24 +02:00
Eelco Dolstra
4f03bfebd9 flake.lock: Update 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/f02fddb8acef29a8b32f10a335d44828d7825b78?narHash=sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds%2Bhc%3D' (2025-05-01)
  → 'github:NixOS/nixpkgs/adaa24fbf46737f3f1b5497bf64bae750f82942e?narHash=sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY%3D' (2025-05-13)

(cherry picked from commit 3ba49d7ec2)
 2025-05-15 10:21:25 +00:00
Jörg Thalheim
7f488dc7d3 rename StoreDirConfigItself to StoreDirConfigBase 
context: https://github.com/NixOS/nix/pull/13154#discussion_r2081904653
(cherry picked from commit 2dd2142754)
 2025-05-15 10:04:22 +00:00
Eelco Dolstra
1b2e88effd Remove otherNixes.nix_2_18 
Nixpkgs no longer has Nix 2.18, so this fails to evaluate.

(cherry picked from commit bc85e20fb9)
 2025-05-15 09:44:21 +00:00
John Ericson
4dcf21a2f6 Merge branch 'master' into 2.29-maintenance 2025-05-14 19:59:35 -04:00
John Ericson
45726dcc55
Merge pull request #13189 from NixOS/rl-next 
Add release notes
 2025-05-14 19:58:59 -04:00
John Ericson
f70796309d
Merge pull request #13193 from xokdvium/lru-cache 
libutil: Less unnecessary copying in `LRUCache`
 2025-05-14 19:29:53 -04:00
John Ericson
ff24751bdd Mark official release 2025-05-14 19:29:50 -04:00
John Ericson
1b22f0252d
Merge pull request #13192 from NixOS/store-open-reg-header 
Factor out `resolveStoreConfig`
 2025-05-14 19:20:05 -04:00
John Ericson
6e9350d53f Add little blurb at the top of 2.29 release notes 2025-05-14 19:05:27 -04:00
John Ericson
29e78faa59 Slightly sort 2.29 release notes 2025-05-14 18:46:35 -04:00
John Ericson
646f3064a3 Cache more contributors 2025-05-14 18:44:39 -04:00
John Ericson
d5e7359155 release notes: 2.29.0 2025-05-14 18:43:53 -04:00
John Ericson
d7481b4b63 Factor out resolveStoreConfig 
Leverage #10766 to show how we can now resolve a store configuration
without actually opening the store for that resolved configuration.

Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
 2025-05-14 18:30:25 -04:00
Robert Hensing
12b7132209
Merge pull request #13188 from NixOS/store-open-reg-header 
Split out `store-open.hh` and `store-registration.hh`
 2025-05-15 00:21:32 +02:00
John Ericson
18894c934f Merge remote-tracking branch 'upstream/master' into rl-next 2025-05-14 18:14:55 -04:00