1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-07 17:41:00 +01:00
Commit graph

21067 commits

Author SHA1 Message Date
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
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
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
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
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
Cole Helbling
63e9e9df37
fixup: only show "you can rerun" message if the derivation's platform is supported on this machine 2025-06-03 10:53:05 -07: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
Graham Christensen
a18fd9b131
Merge pull request #86 from DeterminateSystems/release-v3.6.2/12e4a1d6-8b7e-4bad-b367-cef81f9b2c30
Release v3.6.2
2025-06-03 00:05:53 +00:00
Graham Christensen
03aac2a873
Apply suggestions from code review 2025-06-02 19:34:55 -04:00
github-actions[bot]
49b472604a
Generare release notes for 3.6.2 2025-06-02 23:31:03 +00:00
github-actions[bot]
bb77bf0e3b
Set .version-determinate to 3.6.2 2025-06-02 23:30:58 +00:00
github-actions[bot]
419b5e0599
Prepare release v3.6.2 2025-06-02 23:30:55 +00:00
Graham Christensen
72c1f143ac
Merge pull request #85 from DeterminateSystems/keep-failed-remote-builders-warning
Call out that `--keep-failed` with remote builders will keep the failed build directory on that builder
2025-06-02 22:31:04 +00:00
Cole Helbling
242719cffb
--keep-failed with remote builders will keep the failed build directory on that builder 2025-06-02 14:41:29 -07:00
Graham Christensen
f8aabb0749
Merge pull request #79 from DeterminateSystems/path-position-info
Include the source location when warning about inefficient double copies
2025-06-02 18:51:49 +00:00
Luc Perkins
02c3c64bd4
Merge pull request #84 from DeterminateSystems/lucperkins/gtm-51-update-nix-src-readme-to-better-reflect-what-the-project-is
Rework README
2025-06-02 18:12:21 +00:00
Graham Christensen
7a450a8ba9
Update src/libexpr/paths.cc 2025-06-02 14:08:42 -04:00
Luc Perkins
4398d4e4fc
Merge branch 'lucperkins/gtm-51-update-nix-src-readme-to-better-reflect-what-the-project-is' of https://github.com/DeterminateSystems/nix-src into lucperkins/gtm-51-update-nix-src-readme-to-better-reflect-what-the-project-is 2025-06-02 11:01:41 -07:00
Luc Perkins
e6bcbacadf
Rework language around the manual
Co-authored-by: Graham Christensen <graham@grahamc.com>
2025-06-02 11:01:33 -07:00
Luc Perkins
7bab53af66
Fix dangling link reference 2025-06-02 11:01:06 -07:00
Luc Perkins
d7c2bcbab6
Add WSL to list
Co-authored-by: Graham Christensen <graham@grahamc.com>
2025-06-02 10:56:51 -07:00
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
Graham Christensen
8a82624801
Merge pull request #81 from DeterminateSystems/push-twpuyuspwtpz
Replace ε and ∅
2025-06-02 17:32:11 +00: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
Graham Christensen
1500e541f2 diff-closures: use removed / added words 2025-06-02 11:21:26 -04: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
724d552b64 Use words like added / removed 2025-06-02 09:30:18 -04:00
Graham Christensen
039d19159f Replace ∅ with (absent) 2025-06-02 09:29:55 -04:00