Eelco Dolstra
cbedb8e19a
Fix broken fetchToStore() caching on unlocked inputs
2025-06-13 22:29:20 +02:00
Eelco Dolstra
0922c72777
Fix flakes test with lazy trees enabled
2025-06-12 16:02:42 +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
Eelco Dolstra
5f13d13f78
Fix trace-ifd test failure in dev shell
...
Fixes
error: cannot create symlink '/home/eelco/Dev/nix/tests/functional/flakes/result'; already exists
running the test multiple times in a dev shell.
2025-05-26 13:56:38 +02:00
gustavderdrache
4355b7cbd5
Add test for output warning to ensure stability
2025-05-22 17:30:14 -04:00
Eelco Dolstra
f50117ba4c
Revert storeFS to use makeFSSourceAccessor()
...
Need to investigate why store->getFSAccessor() breaks a test.
2025-05-18 10:01:57 +02:00
Eelco Dolstra
c20642ac7b
Merge remote-tracking branch 'origin/2.29-maintenance' into detsys-main
2025-05-16 12:48:44 +02:00
Eelco Dolstra
824e0d51fe
Test lock file contents more precisely
2025-05-13 10:40:24 +02:00
Eelco Dolstra
51349ca37a
Test lock file contents more precisely
2025-05-12 18:00:40 +02:00
Eelco Dolstra
4ea5cb3832
Fix emitting narHash in lock files when lazy trees are disabled
2025-05-12 17:34:32 +02:00
Eelco Dolstra
d00682beb2
Backward compatibility hack for dealing with dir in URL-style flakerefs
2025-05-09 10:10:42 +02:00
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
Jörg Thalheim
6405d6822d
tests/flakes: add regression test for resolving user flakes
2025-04-25 10:34:41 +02:00
Eelco Dolstra
68de26d38a
lockFlake(): Allow registry lookups for the top-level flake
...
Fixes #13050 .
2025-04-24 18:59:10 +02:00
Eelco Dolstra
dda265f09a
Reapply "Actually ignore system/user registries during locking"
...
This reverts commit 3b5f0d9fb3
2025-04-24 17:33:27 +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
Jörg Thalheim
3b5f0d9fb3
Revert "Actually ignore system/user registries during locking"
...
This reverts commit 77d4316353
2025-04-24 11:28:11 +02: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
Robert Hensing
2109a5a206
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`.
2025-04-15 13:22:53 +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
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
Robert Hensing
fc77a89d53
Merge pull request #12699 from rvl/subflake-locking-test
...
tests/functional/flakes: Add test case for subflake locking
2025-04-09 19:19:34 +02: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
77d4316353
Actually ignore system/user registries during locking
...
Something went wrong in #12068 so this didn't work. Also added a test.
2025-04-09 17:59:51 +02: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
67e957b636
Apply makeNotAllowedError to empty repos
2025-04-02 19:57:49 +02: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
Jörg Thalheim
ca165f09c0
Merge pull request #12583 from ulucs/ulucs/skip-ifds
...
`nix flake show`: Skip IFDs instead of throwing
2025-03-27 11:40:49 +01:00
Uluc Sengil
fcf5966488
skip ifds in nix flake show instead of throwing
2025-03-27 11:16:35 +01:00
Shahar "Dawn" Or
3f56dd9927
stack overflow is EvalBaseError
...
(cherry picked from commit 23c7a45a05
2025-03-21 14:13:40 +00:00
Shahar "Dawn" Or
23c7a45a05
stack overflow is EvalBaseError
2025-03-20 17:43:20 +00:00
Rodney Lorrimar
1bc82d1c86
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.
2025-03-20 13:28:05 +08: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
