nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-12 21:46:01 +01:00
Code Activity
21542 commits 181 branches 219 tags 169 MiB
Commit graph

201 commits

Author SHA1 Message Date
Cole Helbling
facfff45d3
Merge pull request #137 from DeterminateSystems/eelcodolstra/cf-65-determinate-nix-implicit-flake-lock-update-dont-update 
lockFlake(): When updating a lock, respect the input's lock file
 2025-07-09 20:00:02 +00:00
Eelco Dolstra
2ecc5156f4 lockFlake(): When updating a lock, respect the input's lock file 2025-07-09 19:04:29 +02:00
Eelco Dolstra
175406c313 Merge remote-tracking branch 'origin/2.30-maintenance' into sync-2.30.0 2025-07-07 19:23:15 +02:00
Eelco Dolstra
38a73203a4 Fix eval caching for path flakes 
This fix is somewhat hacky since the accessor/input fingerprint
situation is a bit of a mess.
 2025-06-27 20:02:18 +02:00
Eelco Dolstra
b415faceca 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-26 12:56:54 +02:00
Eelco Dolstra
637c4f3ad7 Add tests for deep overrides 
Taken from https://github.com/NixOS/nix/pull/6621.

Co-authored-by: Sebastian Ullrich <sebasti@nullri.ch>
 2025-06-26 12:56:49 +02:00
Eelco Dolstra
0e352a6cec Merge remote-tracking branch 'detsys/detsys-main' into fix-deep-overrides 2025-06-25 21:53:23 +02:00
Eelco Dolstra
1d5e161755
Merge pull request #113 from DeterminateSystems/eelcodolstra/fh-851-lock-nar-hashes-by-default 
Add lazy-locks setting
 2025-06-19 17:01:14 +00:00
Vladimír Čunát
5d2986d3c5 tests: fixup with jq-1.8.0 2025-06-19 18:48:59 +02:00
Luc Perkins
d6710b4c04
Merge remote-tracking branch 'upstream/master' into messages-present-tense 2025-06-18 08:24:23 -07:00
Vladimír Čunát
77f6b6532f
tests: fixup with jq-1.8.0 2025-06-18 10:11:50 +02:00
Eelco Dolstra
3a4e6cadeb Improve regression testing for uncachable source paths 
These now throw an error by default in the test suite.
 2025-06-16 23:59:33 +02:00
Eelco Dolstra
e3fa4faff9 fetchToStore(): Don't require a valid path in dry run mode 2025-06-16 12:27:44 -04:00
Eelco Dolstra
dc5e620032 fetchToStore() cache: Use content hashes instead of store paths 
We can always compute the store path from the content hash, but not
vice versa. Storing the content hash allows `hashPath()` to be
replaced by `fetchToStore(...FetchMode::DryRun...)`, which gets us
caching in lazy-trees mode.
 2025-06-16 12:27:44 -04:00
Eelco Dolstra
cbedb8e19a Fix broken fetchToStore() caching on unlocked inputs 2025-06-13 22:29:20 +02:00
Eelco Dolstra
802f585406 Add lazy-locks setting 
This determines whether lock file entries omit a NAR hash. They're
included by default to make lazy trees compatible with older clients.
 2025-06-13 17:45:37 +02: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
Luc Perkins
ab10fddc6e
Rework future tense in user-facing messages 2025-06-12 09:07:36 -07: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
gustavderdrache
d80f0fb15a Add test for output warning to ensure stability 
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
 2025-05-27 09:18:51 -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
Robert Hensing
f18af849fe
Merge pull request #13170 from MattSturgeon/fix/call-flake/rel-path 
Use correct parent `outPath` for relative path inputs
 2025-05-19 14:13:54 +02: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
Matt Sturgeon
72232bc28a
tests/functional/flakes/non-flake-inputs: Test non-flake inputs having sourceInfo 2025-05-18 00:40:09 +01:00
Robert Hensing
eaee0b4740
tests/function/flakes/relative-paths: Test #13164 2025-05-18 00:40:08 +01: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 77d4316353.

(cherry picked from commit 3b5f0d9fb3)
 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