Jörg Thalheim
2455bda91b
Merge pull request #12986 from obsidiansystems/fix-machine-commment-semicolon
...
Fix another machine config parsing bug
2025-04-09 22:12:26 +02:00
Eelco Dolstra
0cb06d7eda
Rename FlakeCache -> InputCache and key it on Inputs instead of FlakeRefs
2025-04-09 21:38:08 +02:00
John Ericson
b74b0f4e1c
Fix another machine config parsing bug
...
We were ignorning the result of `trim`, and after my last change we were
also trimmming too early.
2025-04-09 15:33:09 -04: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
Jörg Thalheim
d45067177e
Merge pull request #12984 from obsidiansystems/fix-machine-commment-semicolon
...
Fix `;` and `#` bug in machine file parsing
2025-04-09 20:26:03 +02: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
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
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
John Ericson
f8b13cce19
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.
2025-04-09 12:38:42 -04: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
Jörg Thalheim
ea48a318ba
Merge pull request #12979 from DeterminateSystems/fix-ignore-local-registrie
...
Actually ignore system/user registries during locking
2025-04-09 18:32:54 +02:00
Jörg Thalheim
6d50980c2f
Merge pull request #12978 from SuperSandro2000/patch-2
...
Fix meson warning about meson_version 1.1
2025-04-09 18:31:47 +02: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
Sandro
f9a8fdecf5
Fix meson warning about meson_version 1.1
...
meson.options requires that we set meson_version to at least 1.1
similar to #12956
2025-04-09 15:31:34 +02:00
Picnoir
e12369a68e
store URI: introduce multiple signatures support
...
Add a `secretKeyFiles` URI parameter in the store URIs receiving a
coma-separated list of Nix signing keyfiles.
For instance:
nix copy --to "file:///tmp/store?secret-keys=/tmp/key1,/tmp/key2" \
"$(nix build --print-out-paths nixpkgs#hello)"
The keys passed through this new store URI parameter are merged with
the key specified in the `secretKeyFile` parameter, if any.
We'd like to rotate the signing key for cache.nixos.org. To simplify
the transition, we'd like to sign the new paths with two keys: the new
one and the current one. With this, the cache can support nix
configurations only trusting the new key and legacy configurations
only trusting the current key.
See https://github.com/NixOS/rfcs/pull/149 for more informations
behind the motivation.
2025-04-09 13:30:37 +02:00
Eelco Dolstra
f058567e9a
Fix printAmbiguous() / printValueAsJSON()
2025-04-09 00:15:08 +02:00
Eelco Dolstra
fa5cb62604
Revert unneeded test change
2025-04-08 23:41:59 +02:00
Eelco Dolstra
febd28db87
Lazily copy trees to the store
...
We now mount lazy accessors on top of /nix/store without materializing
them, and only materialize them to the real store if needed (e.g. in
the `derivation` primop).
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
c548e92860
Merge pull request #12966 from NixOS/mergify/bp/2.28-maintenance/pr-12958
...
Fix some unlinked tests (backport #12958 )
2025-04-08 13:55:54 +02:00
Robert Hensing
e76bbe413e
Merge pull request #12877 from roberth/c-api-libflake-override-input
...
C API: Flake loading, input overriding
2025-04-08 09:01:51 +02:00
mergify[bot]
a7f078aa84
Merge pull request #12972 from NixOS/mergify/bp/2.28-maintenance/pr-12967
...
Add trailing commas on addFlag incantations (backport #12967 )
2025-04-07 23:56:11 +00:00
Graham Christensen
cd7e01526e
format as required
...
(cherry picked from commit 9b47b2b217
2025-04-07 23:16:28 +00:00
Graham Christensen
16a2cddfb9
Add trailing commas on addFlag incantations
...
(cherry picked from commit 06acbd37bd
2025-04-07 23:16:27 +00:00
John Ericson
73d3159ba0
Merge pull request #12967 from DeterminateSystems/trailing-commas
...
Add trailing commas on addFlag incantations
2025-04-07 19:14:31 -04:00
Graham Christensen
9b47b2b217
format as required
2025-04-07 17:24:41 -04:00
Graham Christensen
06acbd37bd
Add trailing commas on addFlag incantations
2025-04-07 17:18:15 -04:00
mergify[bot]
1a4332fd3a
Merge pull request #12965 from NixOS/mergify/bp/2.28-maintenance/pr-12962
...
Fix some clang-tidy warnings (backport #12962 )
2025-04-07 21:17:06 +00:00
Eelco Dolstra
3a4dc47c22
Remove unused tracing-file-system-object-sink.{hh,cc}
...
(cherry picked from commit 611fd806cb
2025-04-07 20:42:08 +00:00
Eelco Dolstra
f0ed61bb4e
Fix/run monitorfdhup test
...
(cherry picked from commit 340fa00d52
2025-04-07 20:42:08 +00:00
John Ericson
596389a5f6
Merge pull request #12958 from DeterminateSystems/unlinked-tests
...
Fix some unlinked tests
2025-04-07 16:41:07 -04:00
Eelco Dolstra
85902fad58
Fix some clang-tidy warnings
...
(cherry picked from commit c0ad5d36c4
2025-04-07 20:38:07 +00:00
John Ericson
6789202af0
Merge pull request #12962 from DeterminateSystems/clang-tidy-warnings
...
Fix some clang-tidy warnings
2025-04-07 16:37:02 -04:00
mergify[bot]
467a1df842
Merge pull request #12964 from NixOS/mergify/bp/2.28-maintenance/pr-12959
...
Keep fchmodat2-compat.hh private (backport #12959 )
2025-04-07 20:32:05 +00:00
Eelco Dolstra
aa1c690ebf
Keep fchmodat2-compat.hh private
...
Since it references store-config-private.hh.
(cherry picked from commit 04e9dc27ac
2025-04-07 19:18:46 +00:00
John Ericson
3bcc70b64f
Merge pull request #12959 from DeterminateSystems/fchmodat2-compat-private
...
Keep fchmodat2-compat.hh private
2025-04-07 15:17:46 -04:00
mergify[bot]
3a758fc348
Merge pull request #12963 from NixOS/mergify/bp/2.28-maintenance/pr-12961
...
Make lexer-helpers.hh internal to fix a clang-tidy error (backport #12961 )
2025-04-07 19:04:29 +00:00
Eelco Dolstra
17de9dd275
Make lexer-helpers.hh internal to fix a clang-tidy error
...
(cherry picked from commit 8be24f58f2
2025-04-07 18:29:08 +00:00
John Ericson
856f8e0e49
Merge pull request #12961 from DeterminateSystems/lexer-helpers-private
...
Make lexer-helpers.hh internal to fix a clang-tidy error
2025-04-07 14:28:14 -04:00
mergify[bot]
6dde30bacf
Merge pull request #12960 from NixOS/mergify/bp/2.28-maintenance/pr-12956
...
Fix meson warnings on minimum version (backport #12956 )
2025-04-07 18:26:02 +00:00
Eelco Dolstra
c0ad5d36c4
Fix some clang-tidy warnings
2025-04-07 19:55:33 +02:00
Sandro
5b21c94fab
Fix meson warnings on minimum version
...
nix> meson.build:216: WARNING: Project targets '>= 1.1' but uses feature introduced in '1.4.0': fs.name with build_tgt, custom_tgt, and custom_idx.
nix> meson.build:222: WARNING: Project targets '>= 1.1' but uses feature introduced in '1.4.0': fs.name with build_tgt, custom_tgt, and custom_idx.
nix> meson.build:235: WARNING: Project targets '>= 1.1' but uses feature introduced in '1.4.0': fs.name with build_tgt, custom_tgt, and custom_idx.
nix> meson.build:236: WARNING: Project targets '>= 1.1' but uses feature introduced in '1.4.0': fs.name with build_tgt, custom_tgt, and custom_idx.
nix> meson.build:242: WARNING: Project targets '>= 1.1' but uses feature introduced in '1.4.0': fs.name with build_tgt, custom_tgt, and custom_idx.
(cherry picked from commit 14a829acbb
2025-04-07 17:51:44 +00:00
Eelco Dolstra
d1ba01235f
Merge pull request #12956 from SuperSandro2000/patch-2
...
Fix meson warnings on minimum version
2025-04-07 19:50:36 +02:00
Graham Christensen
2233cf1d3c
Merge pull request #26 from DeterminateSystems/cole-h/push-qkwtwqoytvuq
...
ci: manual: don't try to comment on the perpetual PR
2025-04-07 16:33:16 +00:00
Cole Helbling
74bcfbe10c
ci: manual: don't try to comment on the perpetual PR
2025-04-07 09:27:27 -07:00
Eelco Dolstra
8be24f58f2
Make lexer-helpers.hh internal to fix a clang-tidy error
2025-04-07 18:21:08 +02:00
Eelco Dolstra
04e9dc27ac
Keep fchmodat2-compat.hh private
...
Since it references store-config-private.hh.
2025-04-07 18:19:42 +02:00
