nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-21 01:39:36 +01:00
Code Activity
21066 commits 185 branches 219 tags 183 MiB
Commit graph

21066 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eelco Dolstra
7059d2b58b Merge remote-tracking branch 'origin/2.29-maintenance' into sync-2.29.1 2025-06-23 15:02:22 +02:00
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 https://github.com/DeterminateSystems/nix-src/actions/runs/15590867877/job/43909540271:

  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
Eelco Dolstra
1d5e161755
Merge pull request #113 from DeterminateSystems/eelcodolstra/fh-851-lock-nar-hashes-by-default 
Add lazy-locks setting
 2025-06-19 17:01:14 +00:00
Eelco Dolstra
692dfb424a
Merge pull request #117 from DeterminateSystems/test-uncacheable 
Fix fetchToStore() caching with --impure, improve testing
 2025-06-19 16:51:11 +00:00
Vladimír Čunát
5d2986d3c5 tests: fixup with jq-1.8.0 2025-06-19 18:48:59 +02: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
Graham Christensen
fc2d5a18d1
Merge pull request #121 from DeterminateSystems/release-v3.6.6/3dd48fe2-439e-4ecf-884f-aec379a22d28 
Release v3.6.6
 2025-06-17 23:08:38 +00:00
Graham Christensen
cd0128796a
Apply suggestions from code review 2025-06-17 18:21:01 -04:00
github-actions[bot]
f9b88e3229
Generate release notes for 3.6.6 2025-06-17 22:16:00 +00:00
github-actions[bot]
97af07180c
Set .version-determinate to 3.6.6 2025-06-17 22:15:55 +00:00
github-actions[bot]
1eab4236d4
Prepare release v3.6.6 2025-06-17 22:15:52 +00:00
Eelco Dolstra
3a4e6cadeb Improve regression testing for uncachable source paths 
These now throw an error by default in the test suite.
 2025-06-16 23:59:33 +02:00
Eelco Dolstra
a175c67def Fix rootFS fingerprint in the impure case 2025-06-16 23:59:33 +02:00
Eelco Dolstra
5329a45ade Git fetcher: Make dirty repos with no commits cacheable 2025-06-16 23:59:33 +02:00
Graham Christensen
7469e7aa57
Merge pull request #119 from DeterminateSystems/release-v3.6.5/c7ec4397-7427-42b1-87fb-1266bc444391 
Release v3.6.5
 2025-06-16 21:29:31 +00:00
Graham Christensen
0f3892185d Add a final newline in the generated release notes 2025-06-16 17:21:26 -04:00
Graham Christensen
c0e53f3312 Move the 3.6.4 notes over 2025-06-16 17:20:06 -04:00
Graham Christensen
97e2e9159b Fixup generar->te in commit automation 2025-06-16 17:17:42 -04:00
Graham Christensen
fe6972f6f0 Fixup type (generare) 2025-06-16 17:16:25 -04:00
github-actions[bot]
fd4ed4c9f5
Generare release notes for 3.6.5 2025-06-16 21:08:42 +00:00
github-actions[bot]
11d7250448
Set .version-determinate to 3.6.5 2025-06-16 21:08:37 +00:00
github-actions[bot]
2190f6ce66
Prepare release v3.6.5 2025-06-16 21:08:34 +00:00
Graham Christensen
7f21086ce6
Merge pull request #115 from DeterminateSystems/fetchToStore-cache-hashes 
fetchToStore() cache: Use content hashes instead of store paths
 2025-06-16 20:37:40 +00:00
Graham Christensen
408d4a0505
Merge pull request #118 from DeterminateSystems/push-lrtmozosxrvy 
Use GHA runners for VMs since they have KVM
 2025-06-16 20:19:11 +00:00
Graham Christensen
20742e63e2 Use GHA runners for VMs since they have KVM 2025-06-16 16:10:07 -04:00
Graham Christensen
1aadf1e96c
Increase the nixos test timeout to 10 minutes, up from 5 
Most tests complete within 4m, one test -- the docker test -- takes approximately 6m45s. Ten gives us plenty of room ...?
 2025-06-16 13:29:47 -04:00
Eelco Dolstra
b2905dc08e fetchToStore(): Address a FIXME 2025-06-16 12:27:44 -04:00
Eelco Dolstra
e3fa4faff9 fetchToStore(): Don't require a valid path in dry run mode 2025-06-16 12:27:44 -04:00
Eelco Dolstra
af5815fd54 Give unit tests access to a $HOME directory 
Also, don't try to access cache.nixos.org in the libstore unit tests.
 2025-06-16 12:27:44 -04:00
Eelco Dolstra
dc5e620032 fetchToStore() cache: Use content hashes instead of store paths 
We can always compute the store path from the content hash, but not
vice versa. Storing the content hash allows `hashPath()` to be
replaced by `fetchToStore(...FetchMode::DryRun...)`, which gets us
caching in lazy-trees mode.
 2025-06-16 12:27:44 -04:00
Graham Christensen
b0aa12df25
Merge pull request #116 from DeterminateSystems/push-zrwpvlwurrkr 
Don't build fallback-paths if we didn't build aarch64-linux and x86 d…   …arwin
 2025-06-16 16:01:06 +00:00
Graham Christensen
eba6cd8488 Don't build fallback-paths if we didn't build aarch64-linux and x86 darwin 2025-06-16 11:50:13 -04:00
Graham Christensen
151456a999 Change the aarch64 linux / x86 darwin condition to exclude pull request, since we do want to build them on every other trigger 2025-06-16 11:50:13 -04:00
Graham Christensen
d41480dc45
Merge pull request #114 from DeterminateSystems/push-zlvvuopvyszo 
Parallelize the flake regression suite
 2025-06-16 14:49:31 +00:00
Graham Christensen
cf11e27047 Don't stall on a stuck nixos vm test build forever 2025-06-16 10:31:52 -04:00
Graham Christensen
97dc226cae Use fewer runners 2025-06-16 10:31:52 -04:00
Graham Christensen
6185afef92 Run onnamespace, use their cache 2025-06-16 10:31:52 -04:00
Graham Christensen
b0a325d8db Run on GHA runners, not blacksmith due to timeouts 2025-06-16 10:31:52 -04:00
Graham Christensen
f764c9eae3 Add retry to the eval steps, split out m since it takes a while on its own 2025-06-16 10:31:52 -04:00
Graham Christensen
c7d80871ac Parallelize the flake regression suite 2025-06-16 10:31:52 -04:00
Eelco Dolstra
49a059d426
Merge pull request #110 from DeterminateSystems/fix-fetcher-cache 
Fix broken fetchToStore() caching
 2025-06-13 22:30:30 +00:00
Eelco Dolstra
8b9cb382e9 Fix path field in fetcher cache 
86785fd9d1 was broken because it was
storing the full path in the MountedSourceAccessor as the `path` field
in the fetcher cache key (i.e. including the
/nix/store/... prefix). Especially in the case of lazy (virtual) store
paths, this didn't work at all because those paths are different every time.
 2025-06-13 22:29:20 +02:00
Eelco Dolstra
cbedb8e19a Fix broken fetchToStore() caching on unlocked inputs 2025-06-13 22:29:20 +02:00
Graham Christensen
e84daa23f7
Merge pull request #112 from DeterminateSystems/push-xrtwsoznmtqt 
Move the actual vm tests / flake regressions into the generic build phase
 2025-06-13 19:36:22 +00:00
Graham Christensen
8aa7d7d5cc Go back to github hosted runners... blacksmith's keep dying 2025-06-13 15:27:23 -04:00
Eelco Dolstra
b2c762cd2f
Apply suggestions from code review 
Co-authored-by: Luc Perkins <lucperkins@gmail.com>
 2025-06-13 21:03:58 +02:00