Eelco Dolstra
a6faa69fc8
Merge remote-tracking branch 'detsys/detsys-main' into lazy-trees-tmp
2025-04-23 12:25:28 +02:00
Eelco Dolstra
43a26916c2
unsafeGetAttrPos: Set string context on store paths
...
This is needed to devirtualize them when they get passed to a
derivation or builtins.toFile. Arguably, since this builtin is unsafe,
we could just ignore this, but we may as well do the correct thing.
2025-04-18 16:01:19 +02:00
Eelco Dolstra
a8979e05b1
Merge pull request #31 from DeterminateSystems/sync-2.28.2
...
Sync with upstream 2.28.2
2025-04-17 15:35:51 +00:00
Eelco Dolstra
9574d3938f
Tagging release 2.28.2
...
-----BEGIN PGP SIGNATURE-----
iQFHBAABCAAxFiEEtUHVUwEnDgvPFcpdgXC0cm1xmN4FAmgA7TQTHGVkb2xzdHJh
QGdtYWlsLmNvbQAKCRCBcLRybXGY3l0rB/0c5l5EhZUAMvjnUhug8+6/g6fLLisS
ehrP9FxrjV5D2lO3EQcsBgW3bYzOwbcubuPBq8yPMlSLpf+uiAV1qxSKFGD3pnpZ
6o7K3P3kaohFl6JL5oEn9yTGgm1EubYpW3c9zO8yaL32Jknjm44bD4mKr5Rz18jI
YUfe1xDeYCwRY7YMrBKGwU2v/tlsjMX9XQlHuKPSx8uVA/UgxJk/41dIdzb0rhw5
ueuKO2GEEMd/iV5lCEVFnk1WJoHru1fqTDAqRhDZJjFVbguYAIl7OQFQuBbtG3hv
6SFC0iy/IoSrj9tRwSV+4wQU5fk6Gw2IYQlIw6VSx6xIydf46AjomPjX
=xUfr
-----END PGP SIGNATURE-----
Merge tag '2.28.2' into detsys-main
Tagging release 2.28.2
2025-04-17 16:58:05 +02:00
mergify[bot]
8a7b8dce5f
Merge pull request #13033 from NixOS/mergify/bp/2.28-maintenance/pr-13032
...
Improve derivation "advanced attrs" test, fix almost-bug (backport #13032 )
2025-04-15 19:06:26 +00:00
John Ericson
29ae14114e
Remove stray assignment side affect in lambda
...
This was almost a bug! It wasn't simply because another assignment would
clobber it later.
(cherry picked from commit 32409dd7d7
2025-04-15 14:25:16 -04:00
John Ericson
30d900b313
Derivation "advanced attrs" test: Ensure fields are set to distinct values
...
We had fields set to the same values before in our test data. This is
not a problem per-se, but does mean we wouldn't catch certain mixups.
Now, the fields are set to distinct values (where possible), which makes
the test more robust.
(cherry picked from commit a0b2b75f59
2025-04-15 14:25:13 -04:00
John Ericson
5f0ddd7467
Merge pull request #13028 from NixOS/mergify/bp/2.28-maintenance/pr-13022
...
Test derivation options with content-addressing too (backport #13022 )
2025-04-15 12:11:55 -04:00
Eelco Dolstra
0c0dda3b29
Devirtualize double-copied paths
...
Borrowed from the original lazy-trees branch.
2025-04-15 17:44:56 +02:00
John Ericson
f19184191e
Test derivation options with content-addressing too
...
Now, both the unit and functional tests relating to derivation options
are tested both ways -- with input addressing and content-addressing
derivations.
(cherry picked from commit 307dbe9914
2025-04-15 11:25:07 -04:00
John Ericson
37bcd29e5f
Use the same variable for content addressing in functional tests
...
`CONTENT_ADDRESSED` -> `NIX_TESTS_CA_BY_DEFAULT`
(cherry picked from commit 7acc229c8f
2025-04-15 11:19:45 -04:00
Eelco Dolstra
5ecbf6b9dc
Merge pull request #13029 from NixOS/mergify/bp/2.28-maintenance/pr-13026
...
Fix issue #13018 , `sourceInfo` strict in `outputs` (backport #13026 )
2025-04-15 14:24:59 +02:00
Jörg Thalheim
f233a99cc8
Merge pull request #13027 from NixOS/mergify/bp/2.28-maintenance/pr-12603
...
libstore: curl retry: reset content-encoding and don't use string after move (backport #12603 )
2025-04-15 14:00:13 +02:00
Robert Hensing
818fc68db6
fix: Evaluate flake parent source without evaluating its outputs
...
This requires that we refer to the `sourceInfo` instead of the
`result`. However, `sourceInfo` does not create a chain of basedir
resolution, so we add that back with `flakeDir`.
(cherry picked from commit 2109a5a206
2025-04-15 11:52:46 +00:00
Robert Hensing
671364748c
call-flake.nix: allNodes.${key} -> allNodes.${key}.result
...
(cherry picked from commit 9de9410f29
2025-04-15 11:52:45 +00:00
Robert Hensing
9a969e29cf
call-flake.nix: refactor: Bring mapAttrs into scope
...
(cherry picked from commit 674375b021
2025-04-15 11:52:45 +00:00
Philipp Otterbein
a603401cdd
libstore: curl retry: reset content-encoding and don't use string after move
...
(cherry picked from commit b129fc8237
2025-04-15 11:22:25 +00:00
Eelco Dolstra
3e895be4e4
Merge pull request #13021 from NixOS/mergify/bp/2.28-maintenance/pr-13019
...
Mention BLAKE3 in the Nix 2.27 release notes (backport #13019 )
2025-04-14 16:13:07 +02:00
Eelco Dolstra
b1a1f4bd2f
Mention BLAKE3 in the Nix 2.27 release notes
...
(cherry picked from commit c0ed07755a
2025-04-14 13:47:57 +00:00
Eelco Dolstra
e099a5bc67
Move the InputCache to EvalState
2025-04-14 15:02:24 +02:00
Jörg Thalheim
f18180a045
Merge pull request #13011 from NixOS/mergify/bp/2.28-maintenance/pr-13009
...
Fix typo in string context docs (backport #13009 )
2025-04-14 12:41:39 +02:00
Anthony Wang
9156550493
Fix typo in string context docs
...
(cherry picked from commit f64b8957c7
2025-04-12 23:58:45 +00:00
Graham Christensen
a706827799
Merge pull request #30 from DeterminateSystems/release-v3.3.1/20866552-faca-451d-8b79-7a950f146b77
...
Release v3.3.1
2025-04-12 03:07:44 +00:00
github-actions[bot]
398104dcbf
Set .version-determinate to 3.3.1
2025-04-12 02:34:37 +00:00
github-actions[bot]
c1c0e20f2e
Prepare release v3.3.1
2025-04-12 02:34:34 +00:00
mergify[bot]
011f6e06a2
Merge pull request #13006 from NixOS/mergify/bp/2.28-maintenance/pr-12538
...
libstore S3: fix progress bar and make file transfers interruptible (backport #12538 )
2025-04-11 22:54:15 +00:00
Philipp Otterbein
61bb405839
add isInterrupted() call and replace some checkInterrupt() occurrences
...
(cherry picked from commit 49f757c24a
2025-04-11 22:15:12 +00:00
Philipp Otterbein
c53bd8905b
libstore: same progress bar behavior for PUT and POST requests
...
- no differentiation between uploads and downloads in CLI
(cherry picked from commit db297d3dda
2025-04-11 22:15:12 +00:00
Philipp Otterbein
beab9eb978
libstore S3: fix progress bar and make file transfers interruptible
...
(cherry picked from commit 9da01e69f9
2025-04-11 22:15:11 +00:00
Graham Christensen
44cc2ef245
Merge pull request #28 from DeterminateSystems/release-v3.3.0/06a32f4a-6093-4d14-8780-4e4103b77863
...
Release v3.3.0
2025-04-11 21:41:12 +00:00
Cole Helbling
8bd8f5a869
Add Determinate Nix 3.3.0 release notes
2025-04-11 14:05:42 -07:00
github-actions[bot]
454e0f798d
Set .version-determinate to 3.3.0
2025-04-11 20:56:54 +00:00
github-actions[bot]
2596288f88
Prepare release v3.3.0
2025-04-11 20:56:51 +00:00
Graham Christensen
02da540353
Merge pull request #24 from DeterminateSystems/rename-nix-profile-install-to-add
...
Rename `nix profile install` to `nix profile add`
2025-04-10 18:38:33 +00:00
Eelco Dolstra
497fe6dd31
Make nix profile install an alias of nix profile add
2025-04-10 18:48:23 +02:00
Eelco Dolstra
666aa20da8
Move alias support from NixArgs to MultiCommand
...
This allows subcommands to declare aliases, e.g. `nix store ping` is
now a proper alias of `nix store info`.
2025-04-10 18:48:23 +02:00
Eelco Dolstra
62565ce7ce
Remove unused variable
2025-04-10 13:10:20 +02:00
Eelco Dolstra
dd15c8a20d
Move getAccessorCached() to InputCache
...
Also, make fetchTree use InputCache.
2025-04-09 23:06:03 +02:00
mergify[bot]
4d990f1459
Merge pull request #12989 from NixOS/mergify/bp/2.28-maintenance/pr-12986
...
Fix another machine config parsing bug (backport #12986 )
2025-04-09 20:51:33 +00:00
John Ericson
f9c262c3d5
Fix another machine config parsing bug
...
We were ignorning the result of `trim`, and after my last change we were
also trimmming too early.
(cherry picked from commit b74b0f4e1c
2025-04-09 20:13:30 +00:00
Eelco Dolstra
3bbf917707
Move the input cache into libfetchers
2025-04-09 22:13:28 +02:00
Eelco Dolstra
0cb06d7eda
Rename FlakeCache -> InputCache and key it on Inputs instead of FlakeRefs
2025-04-09 21:38:08 +02:00
Eelco Dolstra
f45db85887
Actually ignore system/user registries during locking
...
Something went wrong in #12068 so this didn't work. Also added a test.
2025-04-09 21:04:42 +02:00
mergify[bot]
bb8af4ceb7
Merge pull request #12985 from NixOS/mergify/bp/2.28-maintenance/pr-12984
...
Fix `;` and `#` bug in machine file parsing (backport #12984 )
2025-04-09 19:04:07 +00:00
John Ericson
2892b758b3
Fix ; and # bug in machine file parsing
...
Comments go to the end of the line, not merely the next ; *or* \n. Fix
by splitting on `;` *within* lines, and test.
(cherry picked from commit f8b13cce19
2025-04-09 18:27:16 +00:00
mergify[bot]
e191b93a0e
Merge pull request #12983 from NixOS/mergify/bp/2.28-maintenance/pr-12699
...
tests/functional/flakes: Add test case for subflake locking (backport #12699 )
2025-04-09 17:54:32 +00:00
Rodney Lorrimar
080950b0fe
tests/functional/flakes: Add test case for subflake locking
...
This adds a test case where the lockfile of a relative path flake
dependency is updated.
It was reported by a user here: https://discourse.nixos.org/t/updating-local-subflakes-inputs-when-building-root-flake/61682
I think this test case relates to issue #7730 .
Because the issue is not resolved, this test case would fail without
the `|| true` clause.
(cherry picked from commit 1bc82d1c86
2025-04-09 17:20:31 +00:00
mergify[bot]
6d98cef93f
Merge pull request #12982 from NixOS/mergify/bp/2.28-maintenance/pr-12979
...
Actually ignore system/user registries during locking (backport #12979 )
2025-04-09 17:07:38 +00:00
Eelco Dolstra
a08477975d
Actually ignore system/user registries during locking
...
Something went wrong in #12068 so this didn't work. Also added a test.
(cherry picked from commit 77d4316353
2025-04-09 16:33:47 +00:00
Eelco Dolstra
f058567e9a
Fix printAmbiguous() / printValueAsJSON()
2025-04-09 00:15:08 +02:00
