Eelco Dolstra
bf1c0072f6
Backward compatibility hack for dealing with dir in URL-style flakerefs
2025-05-08 19:12:43 +02:00
Eelco Dolstra
f6ad6291ab
nix flake metadata: Show store path if available
2025-05-07 15:56:35 +02:00
Eelco Dolstra
630bdff7e9
Re-enable _NIX_TEST_FAIL_ON_LARGE_PATH tests
2025-05-07 12:49:11 +02:00
Eelco Dolstra
577b331464
Merge remote-tracking branch 'detsys/detsys-main' into lazy-trees-v2
2025-05-06 19:09:09 +02:00
Eelco Dolstra
c92cb4c130
Tagging release 2.28.3
...
-----BEGIN PGP SIGNATURE-----
iQFHBAABCAAxFiEEtUHVUwEnDgvPFcpdgXC0cm1xmN4FAmgRLc8THGVkb2xzdHJh
QGdtYWlsLmNvbQAKCRCBcLRybXGY3itzB/0ehHDYPXycvwpdL4MuAcroY5GgQJLz
dGkrmv9tMQXERqjnqd86LW6BgKwG3UY12xFMeFgYQyV/TzC6iwZUgI+Kr+baFMhH
JoEXgLTXRwnyC54mXUGPrX6P9MwPBoUpAClaG5iH9SCV70Z/PLuXsd4/HoDmLxsi
tVCTxoq9kn7o/YAMOQGY3KTfM26LqEPOv2vTco2ETEnNqSXCjUJ/MniMdTGCsTxy
rdWqel95EuIb0qsMSRPrVV6xmx/KjamTSzdCcXWQbpAu4xjUyacnjL3XpGWkMUKV
HKtbNdXboHwJgtwe66HMCgtfWPB6JCamMRm+h/b6BrTTz46eJWiaG/KW
=Exmm
-----END PGP SIGNATURE-----
Merge tag '2.28.3' into sync-2.28.3
Tagging release 2.28.3
2025-04-30 17:45:27 +02:00
Jörg Thalheim
709f05989d
tests/flakes: add regression test for resolving user flakes
...
(cherry picked from commit 6405d6822d
2025-04-25 13:32:13 +02:00
Eelco Dolstra
dfbb52e6bd
lockFlake(): Allow registry lookups for the top-level flake
...
Fixes #13050 .
(cherry picked from commit 68de26d38a
2025-04-25 13:31:24 +02:00
Eelco Dolstra
9d87ab1dc8
Add a setting to enable lazy trees
2025-04-24 16:16:28 +02:00
Jörg Thalheim
04fcc879e6
Revert "Actually ignore system/user registries during locking"
...
This reverts commit 77d43163533b5f0d9fb3
2025-04-24 11:34:57 +00:00
Eelco Dolstra
a6faa69fc8
Merge remote-tracking branch 'detsys/detsys-main' into lazy-trees-tmp
2025-04-23 12:25:28 +02: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
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
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
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
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
fa5cb62604
Revert unneeded test change
2025-04-08 23:41:59 +02:00
Eelco Dolstra
c891554999
Merge branch 'lazy-flake-commands' into lazy-trees-v2
2025-04-08 22:16:20 +02:00
Eelco Dolstra
5f74cf9b7a
Apply makeNotAllowedError to empty repos
...
(cherry picked from commit 67e957b636
2025-04-02 18:33:03 +00:00
Eelco Dolstra
fb7bcdd554
Make Git error messages more consistent
2025-04-01 22:56:14 +02:00
Eelco Dolstra
2526293171
shellcheck
2025-04-01 20:52:27 +02:00
Eelco Dolstra
1564c8f9d9
Fix missing file error messages from 'import'
2025-04-01 18:37:21 +02:00
Eelco Dolstra
73b1754816
Mount flake input source accessors on top of storeFS
...
This way, we don't need the PathDisplaySourceAccessor source accessor
hack, since error messages are produced directly by the original
source accessor.
In fact, we don't even need to copy the inputs to the store at all, so
this gets us very close to lazy trees. We just need to know the store
path so that requires hashing the entire input, which isn't lazy. But
the next step will be to use a virtual store path that gets rewritten
to the actual store path only when needed.
2025-04-01 17:49:28 +02:00
Eelco Dolstra
fcddf4afe3
Apply makeNotAllowedError to empty repos
2025-04-01 15:35:01 +02:00
Eelco Dolstra
b2038f120c
Add test for source path display
2025-04-01 14:03:16 +02:00
Shahar "Dawn" Or
3f56dd9927
stack overflow is EvalBaseError
...
(cherry picked from commit 23c7a45a05
2025-03-21 14:13:40 +00:00
Eelco Dolstra
1293388039
Merge pull request #12544 from xokdvium/debugger-use-after-free
...
libexpr: Fix use-after-free of StaticEnv::up
2025-02-27 16:55:49 +01:00
Eelco Dolstra
14c9755462
nix flake archive: Recurse into relative path inputs
...
We can't ignore them entirely, since we do want to archive their
transitive inputs.
Fixes #12438 .
2025-02-24 22:10:02 +01:00
Eelco Dolstra
b4dfeafed5
nix flake archive: Skip relative path inputs
...
Fixes #12438 .
2025-02-24 15:30:30 +01:00
Sergei Zimmerman
0d5004508f
tests/functional: Add flake-based regression for debugger use-after-free
...
This is the simplest reproducer I have. It would be great to find
a repro without flakes, but I guess this should be ok for now.
2025-02-21 14:36:39 +00:00
Eelco Dolstra
9e6b89c92c
lockFlake(): Always compute a NAR hash for inputs
...
For the top-level flake, we don't need a NAR hash. But for inputs, we
do.
Also, add a test for the lazy behaviour of `nix flake metadata|lock`.
2025-02-10 18:05:34 +01:00
Eelco Dolstra
f24ff056cb
Make nix flake metadata|update|lock lazy
...
These don't need to evaluate anything (except for the flake metadata
in flake.nix) so we can make these commands operate on lazy trees
without risk of any semantic change in the evaluator.
However, `nix flake metadata` now no longer prints the store path,
which is a breaking change (but unavoidable if we want lazy trees).
2025-02-10 17:59:14 +01:00
Eelco Dolstra
b813a764e0
Merge remote-tracking branch 'origin/master' into self-input-attrs
2025-02-10 17:01:19 +01:00
Eelco Dolstra
38f391444b
Add a test for a flake referencing a flake that has inputs.self
2025-02-04 22:14:38 +01:00
Eelco Dolstra
25fcc8d1ab
Add inputs.self.submodules flake attribute
...
This allows a flake to specify that it needs Git submodules to be
enabled (or disabled, if we ever change the default) on the top-level
flake. This requires the input to be refetched, but since the first
fetch is lazy, this shouldn't be expensive.
Currently the only attribute allowed by `inputs.self` is `submodules`,
but more can be added in the future (e.g. a `lazy` attribute to opt in
to lazy tree behaviour).
Fixes #5312 , #9842 .
2025-02-04 21:16:33 +01:00
John Ericson
f90ba3a7c1
Update tests/functional/flakes/symlink-paths.sh
2025-02-04 11:25:14 -05:00
Eelco Dolstra
3c109095de
Use 'nix flake prefetch' to get the store path of a flake
...
Future-proofing for when 'nix flake metadata' won't return a store
path anymore.
2025-02-04 15:24:50 +01:00
silvanshade
137ba71f02
Fix shellcheck lints
2025-02-03 17:47:37 -07:00
mergify[bot]
24d11d22c3
Merge pull request #12286 from stevalkr/flakes_symlink_path
...
Fix flakes follow symlinks
2025-02-02 03:11:20 +00:00
Steve Walker
453e8dc067
Fix flakes follow symlinks
...
Co-authored-by: Jan Christoph Bischko <jbischko@barracuda.com>
2025-02-02 08:30:04 +07:00
Eelco Dolstra
4113fdf2f0
Allow use of lock files with unlocked entries as long as they have a NAR hash
...
Fixes #12364 .
2025-01-31 17:03:27 +01:00
Eelco Dolstra
521667eb89
Fix follow-paths test
...
Since ff8e2fe84e
2025-01-16 11:19:20 +01:00
Eelco Dolstra
550fe889ee
Merge remote-tracking branch 'origin/master' into relative-flakes
2025-01-16 11:05:10 +01:00
John Ericson
e02026adae
Merge pull request #12254 from DeterminateSystems/fix-relative-path-on-cli
...
Fix relative 'path:' flakerefs in the CLI
2025-01-15 15:19:56 -05:00
mergify[bot]
c45dfeeef3
Merge pull request #12220 from DeterminateSystems/allow-dirty-locks
...
Add setting 'allow-dirty-locks'
2025-01-15 20:18:28 +00:00
Eelco Dolstra
ff8e2fe84e
Fix relative 'path:' flakerefs in the CLI
...
And handle relative 'git+file:' flakerefs while we're at it (these
crashed with an assertion failure).
Fixes #12248 .
2025-01-14 17:30:13 +01:00
Eelco Dolstra
cd0127f957
Merge remote-tracking branch 'origin/master' into relative-flakes
2025-01-13 14:13:56 +01:00
Eelco Dolstra
e161393299
Add setting 'allow-dirty-locks'
...
This allows writing lock files with dirty inputs, so long as they have
a NAR hash. (Currently they always have a NAR hash, but with lazy
trees that may not always be the case.)
Generally dirty locks are bad for reproducibility (we can detect if
the dirty input has changed, but we have no way to fetch it except
substitution). Hence we don't allow them by default.
Fixes #11181 .
2025-01-10 17:55:30 +01:00
Robert Hensing
d9a50c0af2
Clarify cd call in tests/functional/flakes/flakes.sh
2025-01-10 09:57:54 +01:00
Bryan Lai
37ac18d1d9
tests/flake-in-submodule: git+file:./* input
2025-01-10 11:44:55 +08:00
Bryan Lai
9d088fa502
tests/flakes: check git+file:./${submodule} protocol
...
Relative, local git repo used to work (for submodules), but it
fails after 3e0129ce3b
2025-01-10 11:37:29 +08:00
