1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-11 13:06:01 +01:00
Commit graph

20987 commits

Author SHA1 Message Date
Luc Perkins
b8e8214d5f
Fix one more 'will' 2025-06-12 08:28:01 -07:00
Luc Perkins
e565571f69
Re-supply inadvertently deleted word 2025-06-12 08:25:10 -07:00
Graham Christensen
46c1a714ba
Merge pull request #105 from DeterminateSystems/run-lazy-trees-tests
Run the Nix test suite with lazy trees enabled
2025-06-12 14:46:44 +00:00
Eelco Dolstra
279a6b18db Formatting 2025-06-12 16:13:28 +02:00
Eelco Dolstra
6477d7c2ca mountInput(): Optimize getting the NAR hash for real store paths 2025-06-12 16:11:54 +02:00
Eelco Dolstra
fca291afc3 Fix NAR hash checking for fetchGit with lazy tees
If a NAR hash is specified, we should probably check
it. Unfortunately, for now this has the side effect of forcing NAR
hash checking of any input that has a NAR hash.
2025-06-12 16:02:42 +02:00
Eelco Dolstra
b067e6566f Git fetcher: Do not consider a null revision (i.e. workdir) to be locked 2025-06-12 16:02:42 +02:00
Eelco Dolstra
0922c72777 Fix flakes test with lazy trees enabled 2025-06-12 16:02:42 +02:00
Eelco Dolstra
92d90e2aeb Run the Nix test suite with lazy trees enabled 2025-06-12 16:02:42 +02:00
Cole Helbling
3114862518
Merge pull request #98 from DeterminateSystems/fix-fetchToStore-dryRun-caching
fetchToStore(): Improve caching in dry-run mode
2025-06-12 00:25:23 +00:00
Graham Christensen
c77a857485
Merge pull request #104 from DeterminateSystems/push-kutvxtkvzunk
Go back to x86 native macOS builds
2025-06-11 19:40:28 +00:00
Graham Christensen
7051591b13 Go back to x86 native macOS builds
It seems that rosetta is sometimes faster, and sometimes WAY slower.
2025-06-11 15:31:09 -04:00
Eelco Dolstra
168184a0d4
Merge pull request #100 from DeterminateSystems/lib-tests-lazy
Run nixpkgsLibTests in lazy trees mode
2025-06-11 18:51:13 +00:00
Eelco Dolstra
a95067d428
Merge pull request #103 from DeterminateSystems/repl-test-robust
Make the repl test more robust
2025-06-11 17:37:40 +00:00
Luc Perkins
27755169f9
Merge pull request #92 from DeterminateSystems/lucperkins/fh-864-fix-error-messages-to-avoid-fake-future-tense
Fix some instances of 'will'
2025-06-11 17:27:24 +00:00
Eelco Dolstra
87fb81a624 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.
2025-06-11 19:14:31 +02:00
Eelco Dolstra
e9c60028f5
Merge pull request #102 from DeterminateSystems/fix-broken-conf-link
Fix broken link in configuration description
2025-06-11 16:09:44 +00:00
Luc Perkins
42c50aafad
Fix broken link in configuration description 2025-06-11 08:55:46 -07:00
Graham Christensen
7a75a3877e
Merge pull request #101 from DeterminateSystems/gustavderdrache/backport-s3-test
Make the S3 test more robust
2025-06-11 15:49:40 +00:00
Eelco Dolstra
31e58dcb92 nix-instantiate --eval --xml: Devirtualize the output 2025-06-11 17:18:42 +02:00
Eelco Dolstra
df7a2a1bed nix-instantiate --eval --json: Devirtualize the output 2025-06-11 17:14:33 +02:00
Eelco Dolstra
7bafc99f20 Run nixpkgsLibTests in lazy trees mode 2025-06-11 16:50:42 +02:00
Eelco Dolstra
de793b7324 Make the S3 test more robust
Waiting for the minio unit is apparently not reliable enough, so let's
also wait for the port.
2025-06-11 10:48:57 -04:00
Eelco Dolstra
2f5a545997 fetchToStore(): Improve caching in dry-run mode
In dry-run mode, we don't need to require a valid path.
2025-06-11 16:13:40 +02:00
Graham Christensen
c6f87378db
Update src/libmain/plugin.cc
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
2025-06-11 10:02:27 -04:00
Graham Christensen
ac6318c9c5
Merge pull request #97 from DeterminateSystems/fix-duplicate-builtins
Don't register extra primops twice
2025-06-11 13:10:23 +00:00
Eelco Dolstra
7f6efe93e4 Don't register extra primops twice
This was the result of a bad merge.
2025-06-11 13:06:14 +02:00
Eelco Dolstra
550c894712
Merge pull request #93 from DeterminateSystems/fix-fetcher-cache
Fix fetchToStore() caching
2025-06-11 10:41:57 +00:00
Eelco Dolstra
96874f418d
Merge pull request #89 from DeterminateSystems/flakehub-inputs
Use FlakeHub inputs
2025-06-11 08:16:54 +00:00
Luc Perkins
054cab01e1
Provide strict version constraint for Nixpkgs 2025-06-10 18:42:40 -07:00
Luc Perkins
c81596180a
Make Nixpkgs hash match current hash 2025-06-10 18:39:02 -07:00
Luc Perkins
6898f04a32
Merge remote-tracking branch 'origin/detsys-main' into flakehub-inputs 2025-06-07 10:12:17 -07:00
Graham Christensen
62029df300 Fixup checks around the error message 'Will not write lock file of flake' 2025-06-06 17:29:11 -04:00
Graham Christensen
cbb635159c Fixup checks around the error message 'will not fetch unlocked input' 2025-06-06 17:28:17 -04:00
Eelco Dolstra
86785fd9d1 fetchToStore(): Fix caching
This was broken because MountedSourceAccessor did not return a
fingerprint. Previously fingerprints were global to an accessor, but
with a MountedSourceAccessor the fingerprint can be different for each
mount point.
2025-06-06 22:09:35 +02:00
Eelco Dolstra
f8ef941c04 fetchToStore(): Cache in dry-run mode 2025-06-06 21:50:55 +02:00
Eelco Dolstra
0e1df1c0f1
Merge pull request #91 from DeterminateSystems/fix-substituted-input-path-display
Fix rendering of paths in substituted source trees
2025-06-06 18:13:34 +00:00
Eelco Dolstra
74af43ee91
Remove superfluous semicolon
Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
2025-06-06 20:03:33 +02:00
Luc Perkins
cddb268635
Merge remote-tracking branch 'origin/detsys-main' into flakehub-inputs 2025-06-06 10:52:43 -07:00
Luc Perkins
a989a23d1a
Fix some instances of 'will' 2025-06-06 10:51:58 -07:00
Eelco Dolstra
e18b1637dc Fix display of paths in substituted source trees
These got displayed as e.g.

  «github:NixOS/nixpkgs/adaa24fbf46737f3f1b5497bf64bae750f82942e?narHash=sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY%3D»/nix/store/x9wnkly3k1gkq580m90jjn32q9f05q2v-source/pkgs/stdenv/generic/source-stdenv.sh

Now we get

  «github:NixOS/nixpkgs/adaa24fbf46737f3f1b5497bf64bae750f82942e?narHash=sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY%3D»/pkgs/stdenv/generic/source-stdenv.sh
2025-06-06 19:41:12 +02:00
Eelco Dolstra
a69b99ade0 Add ForwardingSourceAccessor 2025-06-06 19:40:57 +02:00
Luc Perkins
112ff50944
Use specific revision for git-hooks 2025-06-06 09:04:15 -07:00
Luc Perkins
214654d91f
Remove unnecessary follows directive 2025-06-06 08:14:36 -07:00
Graham Christensen
76b9be3782
Merge pull request #90 from DeterminateSystems/gustavderdrache/release-published
Use 'published' release type to avoid double uploads
2025-06-05 21:22:17 +00:00
gustavderdrache
aed1e025ff Use 'published' release type to avoid double uploads 2025-06-05 17:13:10 -04:00
Luc Perkins
268bef8cdf
Use FlakeHub inputs 2025-06-04 23:04:13 -07:00
Cole Helbling
e98cad60b2
Merge pull request #88 from DeterminateSystems/fh-846-improve-nix-error-when-sandbox-path-doesnt-exist
libstore/unix/derivation-builder: error earlier when sandbox path is inaccessible
2025-06-04 19:27:59 +00:00
Cole Helbling
dfa7b2a288
libstore/unix/derivation-builder: error earlier when sandbox path is inaccessible 2025-06-04 12:16:34 -07:00
Cole Helbling
2a96ae22d7
Merge pull request #87 from DeterminateSystems/disable-builders-message-only-on-buildable-platform
fixup: only show "you can rerun" message if the derivation's platform is supported on this machine
2025-06-03 18:03:54 +00:00