1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-23 02:39:37 +01:00
Commit graph

21470 commits

Author SHA1 Message Date
Sergei Zimmerman
c2aaa68c2c
libexpr: Use primOp getter 2025-06-10 13:37:01 +00:00
Luc Perkins
6898f04a32
Merge remote-tracking branch 'origin/detsys-main' into flakehub-inputs 2025-06-07 10:12:17 -07:00
Robert Hensing
c5b1be46b4
Merge pull request #11406 from kstrafe/master
nix repl: Print which variables are just loaded
2025-06-07 13:53:13 +02:00
Robert Hensing
102259898c
Merge pull request #13258 from NaN-git/opt-symbol-table
Optimize symbol table
2025-06-07 13:16:14 +02:00
h0nIg
2caccbed11
docker: shrink code - use buildenv.manifest 2025-06-06 23:54:15 +02: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
John Ericson
530efc3121
Merge pull request #13334 from NixOS/repl-incomplete-parse
repl: Don't wait on incomplete parses from imported file
2025-06-06 14:08:15 -04: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
Eelco Dolstra
91b3573770 Rethrow non-EOF errors 2025-06-06 17:09:01 +02:00
Eelco Dolstra
d8b067b549 repl: Don't wait on incomplete parses from imported file
Fixes #13332.
2025-06-06 14:14:57 +02: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
Jörg Thalheim
37b4407c5c
Merge pull request #13284 from getchoo-contrib/getchoo/override-input-local-registry
lockFlake(): Allow registry lookups for overridden inputs
2025-06-06 10:11:27 +02:00
Jörg Thalheim
540db8036d
Merge pull request #13326 from NixOS/no-double-copy
docker.nix: Prevent double copy of nixpkgs source tree
2025-06-06 10:09:31 +02:00
Kevin Robert Stravers
13e3704329
nix repl: Add :ll to show all recently loaded variables
Invoking `:ll` will start a pager with all variables which have just
been loaded by `:lf`, `:l`, or by a flake provided to `nix repl` as an
argument.

https://github.com/NixOS/nix/issues/11404
2025-06-05 17:33:04 -04:00
Kevin Robert Stravers
3c9b9b13af
nix repl: Print which variables are just loaded
When we run `nix repl nixpkgs` we get "Added 6 variables". This is not
useful as it doesn't tell us which variables the flake has exported to
our global repl scope.

This patch prints the name of each variable that was just loaded. We
currently cap printing to 20 variables in order to avoid excessive
prints.

https://github.com/NixOS/nix/issues/11404
2025-06-05 17:32:57 -04:00
h0nIg
e72a0ad8c3
docker: add docu references & remove duplicate code 2025-06-05 23:28:47 +02: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
Eelco Dolstra
0a87ba0e39 Prevent double copy of nixpkgs source tree 2025-06-05 13:46:08 +02:00
Eelco Dolstra
2afc84fddf
Merge pull request #13323 from NixOS/git-accessor-thread-safe
GitSourceAccessor: Make thread-safe
2025-06-05 09:33:03 +02:00
Luc Perkins
268bef8cdf
Use FlakeHub inputs 2025-06-04 23:04:13 -07:00
Eelco Dolstra
4bce2d723d GitSourceAccessor: Make thread-safe 2025-06-04 21:39:15 +02: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
Jörg Thalheim
4751cbef63
Merge pull request #13321 from poperigby/docker-map-attrs-flatten-replacement
Modify docker.nix to use mapAttrsToList instead of mapAttrsFlatten
2025-06-04 06:49:28 +02:00
PopeRigby
cfc15d6921 Modify docker.nix to use mapAttrsToList instead of mapAttrsFlatten
The latter alias is deprecated in favor of the former, and produces a
warning.
2025-06-03 13:26:09 -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
Jörg Thalheim
4b8f74b3a3
Merge pull request #13320 from DeterminateSystems/keep-failed-remote-builders-warning
Clarify that `--keep-failed` with remote builders will keep the failed build directory on that builder
2025-06-03 19:28:20 +02: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
Cole Helbling
54aa73b19b
fixup: only show "you can rerun" message if the derivation's platform is supported on this machine 2025-06-03 08:38:50 -07: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
Cole Helbling
0712339912
--keep-failed with remote builders will keep the failed build directory on that builder 2025-06-03 07:50:29 -07: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
Jörg Thalheim
6a761c1a60
Merge pull request #13296 from xokdvium/empty-accessor-prefix
Clear `displayPrefix` in `makeEmptySourceAccessor`
2025-06-03 01:32:46 +02:00
github-actions[bot]
49b472604a
Generare release notes for 3.6.2 2025-06-02 23:31:03 +00:00