1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-14 04:51:05 +01:00
Commit graph

21449 commits

Author SHA1 Message Date
Jörg Thalheim
a1fe09d2c8
Merge pull request #13350 from xokdvium/meson-format
flake: Add meson formatter
2025-06-13 11:37:32 +02:00
Jörg Thalheim
84743c84c0
Merge pull request #13351 from drupol/push-rrzylpqynznw
docker: make sure `nix config check` works
2025-06-13 07:41:27 +02:00
Jörg Thalheim
82397e220d
Merge branch 'master' into push-rrzylpqynznw 2025-06-13 07:06:11 +02:00
Jörg Thalheim
918ac6b2fc
Merge pull request #13354 from drupol/push-sopslzmmlqxu
docker: use `callPackage`, parametrise the image build
2025-06-13 07:03:23 +02:00
Jörg Thalheim
d12e42489a
Merge pull request #13360 from xokdvium/duplicate-list-elems-overload
libexpr: Remove non-const overload of `listElems`
2025-06-13 07:03:03 +02:00
John Ericson
f8c1ac9515 Introduce top-level structuredAttrs field in JSON derivation format
Makes the behavoral change of #13263 without the underlying refactor.
Hopefully this clearly safe from a perf and GC perspective, and will
make it easier to benchmark #13263.
2025-06-12 20:45:47 -04:00
Graham Christensen
1533b85da3
Merge pull request #109 from DeterminateSystems/release-v3.6.4/afc44aa9-a290-409e-90f9-a3497b03c021
Release v3.6.4
2025-06-12 23:57:13 +00:00
Graham Christensen
da67f596de Mark 3.6.3 as revoked, and use its notes for 3.6.4 2025-06-12 19:54:50 -04:00
github-actions[bot]
ac5cbe7c88
Generare release notes for 3.6.4 2025-06-12 23:23:32 +00:00
github-actions[bot]
17de8fd29c
Set .version-determinate to 3.6.4 2025-06-12 23:23:27 +00:00
github-actions[bot]
760e6e5f1e
Prepare release v3.6.4 2025-06-12 23:23:24 +00:00
Sergei Zimmerman
7b46eb9958
libexpr: Remove non-const overload of listElems
This overload isn't actually necessary anywhere and
doesn't make much sense. The pointers to `Value`s are
themselves const, but the `Value`s are mutable.
A non-const member function implies that the object itself
can be modified but this doesn't make much sense considering
the return type: `Value * const * `, which is a pointer
to a constant array of pointers to mutable values.
2025-06-12 22:29:05 +00:00
Robert Hensing
c437e27abc
Merge pull request #13357 from xokdvium/more-getters
libexpr: Use more `Value` getters instead of reading `payload` directly (NFC)
2025-06-12 23:03:20 +02:00
Sergei Zimmerman
bc6b52aff0
libexpr: Add and use pathAccessor getter 2025-06-12 20:01:38 +00:00
Sergei Zimmerman
e4df189123
libexpr: Add and use pathStr getter 2025-06-12 19:57:46 +00:00
Sergei Zimmerman
c041d71406
libexpr: Add and use app getter 2025-06-12 19:53:44 +00:00
Sergei Zimmerman
f07a9f863e
libexpr: Add and use primOpApp getter 2025-06-12 19:51:44 +00:00
Sergei Zimmerman
441fa86e82
libexpr: Add and use thunk getter 2025-06-12 19:48:42 +00:00
Sergei Zimmerman
6587e7bcff
libexpr: Add and use lambda getter 2025-06-12 19:42:50 +00:00
Samuli Thomasson
0f6cb33763
fix throwing output paths out of sandbox paths
It seems obvious that erasing any output paths from pathsInChroot needs
to happen after getPathsInSandbox(), not before.

Signed-off-by: Samuli Thomasson <samuli.thomasson@pm.me>
2025-06-12 21:36:04 +02:00
Graham Christensen
60257ecd17
Merge pull request #106 from DeterminateSystems/release-v3.6.3/1649aa00-94c6-44df-b2b1-12e5750b76fc
Release v3.6.3
2025-06-12 18:48:34 +00:00
Eelco Dolstra
6999183956 Don't allow flake inputs to have both a flakeref and a follows
Having both doesn't make sense so it's best to disallow it. If this
causes issues we could turn into a warning.
2025-06-12 20:38:51 +02:00
Eelco Dolstra
9a18a11d7d Add tests for deep overrides
Taken from https://github.com/NixOS/nix/pull/6621.

Co-authored-by: Sebastian Ullrich <sebasti@nullri.ch>
2025-06-12 20:33:28 +02:00
Eelco Dolstra
a572c94333 Fix deep overrides
An override like

  inputs.foo.inputs.bar.inputs.nixpkgs.follows = "nixpkgs";

implicitly set `inputs.foo.inputs.bar` to `flake:bar`, which led to an
unexpected error like

  error: cannot find flake 'flake:bar' in the flake registries

We now no longer create a parent override (like for `foo.bar` in the
example above) if it doesn't set an explicit ref or follows
attribute. We only recursively apply its child overrides.

Fixes https://github.com/NixOS/nix/issues/8325, https://github.com/DeterminateSystems/nix-src/issues/95, https://github.com/NixOS/nix/issues/12083, https://github.com/NixOS/nix/issues/5790.
2025-06-12 20:32:58 +02:00
Pol Dellaiera
6eb4ee6855 docker: replace git with gitMinimal 2025-06-12 19:50:52 +02:00
Pol Dellaiera
5862f38d00 docker: use callPackage, parametrise the image build 2025-06-12 19:50:31 +02:00
Graham Christensen
642d1bdfb2
Update doc/manual/source/release-notes-determinate/rl-3.6.3.md 2025-06-12 13:23:39 -04:00
Pol Dellaiera
5abaf361a4 docker: reduce duplicates, use coreutils-full 2025-06-12 19:06:48 +02:00
Graham Christensen
b9e876768f
Merge pull request #107 from DeterminateSystems/fix-typo
Re-supply inadvertently deleted word
2025-06-12 16:49:26 +00:00
Luc Perkins
ab10fddc6e
Rework future tense in user-facing messages 2025-06-12 09:07:36 -07:00
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
Graham Christensen
829d3f8543
Apply suggestions from code review 2025-06-12 10:09:10 -04:00
Graham Christensen
4921297695
Update doc/manual/source/release-notes-determinate/rl-3.6.3.md 2025-06-12 10:08:59 -04:00
Graham Christensen
f6b612135d
Update doc/manual/source/release-notes-determinate/changes.md 2025-06-12 10:08:42 -04: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
github-actions[bot]
f4a3894ec9
Generare release notes for 3.6.3 2025-06-12 14:02:13 +00:00
github-actions[bot]
c36fc11bc6
Set .version-determinate to 3.6.3 2025-06-12 14:02:08 +00:00
github-actions[bot]
db3cecdbe0
Prepare release v3.6.3 2025-06-12 14:02:05 +00:00
Pol Dellaiera
57c72dee9b docker: make sure nix config check works 2025-06-12 11:01:17 +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
Sergei Zimmerman
93a42a5971
flake: Add meson formatter
This adds a meson.format file that mostly mirrors the projects
meson style and a pre-commit hook to enforce this style.
Some low-diff files are formatted.
2025-06-11 22:08:03 +00:00
John Ericson
371fcf91c3
Merge pull request #13294 from obsidiansystems/fix-13293
Fix #13293
2025-06-11 16:55:43 -04:00
John Ericson
5267718472 Fix #13293
We move the `assertPathValidity` to where we know what the wanted
outputs are.
2025-06-11 16:15:26 -04:00