1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-10 20:46:01 +01:00
Commit graph

21542 commits

Author SHA1 Message Date
github-actions[bot]
fd4ed4c9f5
Generare release notes for 3.6.5 2025-06-16 21:08:42 +00:00
github-actions[bot]
11d7250448
Set .version-determinate to 3.6.5 2025-06-16 21:08:37 +00:00
github-actions[bot]
2190f6ce66
Prepare release v3.6.5 2025-06-16 21:08:34 +00:00
Graham Christensen
7f21086ce6
Merge pull request #115 from DeterminateSystems/fetchToStore-cache-hashes
fetchToStore() cache: Use content hashes instead of store paths
2025-06-16 20:37:40 +00:00
Graham Christensen
408d4a0505
Merge pull request #118 from DeterminateSystems/push-lrtmozosxrvy
Use GHA runners for VMs since they have KVM
2025-06-16 20:19:11 +00:00
Graham Christensen
20742e63e2 Use GHA runners for VMs since they have KVM 2025-06-16 16:10:07 -04:00
Graham Christensen
1aadf1e96c
Increase the nixos test timeout to 10 minutes, up from 5
Most tests complete within 4m, one test -- the docker test -- takes approximately 6m45s. Ten gives us plenty of room ...?
2025-06-16 13:29:47 -04:00
Eelco Dolstra
b2905dc08e fetchToStore(): Address a FIXME 2025-06-16 12:27:44 -04: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
af5815fd54 Give unit tests access to a $HOME directory
Also, don't try to access cache.nixos.org in the libstore unit tests.
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
Graham Christensen
b0aa12df25
Merge pull request #116 from DeterminateSystems/push-zrwpvlwurrkr
Don't build fallback-paths if we didn't build aarch64-linux and x86 d…   …arwin
2025-06-16 16:01:06 +00:00
Graham Christensen
eba6cd8488 Don't build fallback-paths if we didn't build aarch64-linux and x86 darwin 2025-06-16 11:50:13 -04:00
Graham Christensen
151456a999 Change the aarch64 linux / x86 darwin condition to exclude pull request, since we do want to build them on every other trigger 2025-06-16 11:50:13 -04:00
Graham Christensen
d41480dc45
Merge pull request #114 from DeterminateSystems/push-zlvvuopvyszo
Parallelize the flake regression suite
2025-06-16 14:49:31 +00:00
Graham Christensen
cf11e27047 Don't stall on a stuck nixos vm test build forever 2025-06-16 10:31:52 -04:00
Graham Christensen
97dc226cae Use fewer runners 2025-06-16 10:31:52 -04:00
Graham Christensen
6185afef92 Run onnamespace, use their cache 2025-06-16 10:31:52 -04:00
Graham Christensen
b0a325d8db Run on GHA runners, not blacksmith due to timeouts 2025-06-16 10:31:52 -04:00
Graham Christensen
f764c9eae3 Add retry to the eval steps, split out m since it takes a while on its own 2025-06-16 10:31:52 -04:00
Graham Christensen
c7d80871ac Parallelize the flake regression suite 2025-06-16 10:31:52 -04:00
tomberek
af01fea5d6
Merge pull request #12623 from xokdvium/ord-safe-sort
Switch builtins.sort to a custom stable PeekSort
2025-06-16 05:11:23 -04:00
Pol Dellaiera
bb44347fac docker: expose config.Cmd as parameter 2025-06-16 08:16:39 +02:00
Pol Dellaiera
18dc96269d docker: add basics OpenContainers labels 2025-06-16 08:16:39 +02:00
Philipp Otterbein
c1aaa970c7 libexpr: further removal of std::string copies 2025-06-15 21:56:45 +02:00
Sergei Zimmerman
f9170a84f6
tests/functional/lang: Add sort stability test for lists langer than 16 elements
libstdc++'s std::stable_sort and new builtins.sort implementation
special-case ranges with length less than or equal to 16 and delegate
to insertionsort.

Having a larger e2e test would allow catching sort stability issues
at functional level as well.
2025-06-15 16:52:08 +00:00
Sergei Zimmerman
ddcfc81ff1
libexpr: Document requirements for comparator passed to builtins.sort 2025-06-15 16:52:05 +00:00
Sergei Zimmerman
351d898c43
libexpr: Switch builtins.sort primop to use peeksort
This prevents C++ level undefined behavior from affecting
the evaluator. Stdlib implementation details should not affect
eval, regardless of the build platform. Even erroneous usage
of `builtins.sort` should not make it possible to crash the
evaluator or produce results that depend on the host platform.
2025-06-15 16:52:03 +00:00
Sergei Zimmerman
b2596a7615
libutil: Add custom PeekSort implementation
Unlike std::sort and std::stable_sort, this implementation
does not lead to out-of-bounds memory reads or other undefined
behavior when the predicate is not strict weak ordering.

This makes it possible to use this function in libexpr for
builtins.sort, where an incorrectly implemented comparator
in the user nix code currently can crash and burn the evaluator
by invoking C++ UB.
2025-06-15 16:52:01 +00:00
Jörg Thalheim
e73fcd008a
Merge pull request #13364 from drupol/push-qspryqrvmpkt
docker: remove last use of `pkgs.`
2025-06-15 06:09:52 +02:00
Pol Dellaiera
e27a062783 docker: remove last use of pkgs.
Follow-up of https://github.com/NixOS/nix/pull/13354
2025-06-14 10:38:20 +02:00
Jörg Thalheim
46853c467d
Merge pull request #13361 from jayeshv/patch-1
Fix a minor typo
2025-06-14 02:01:05 +02:00
Eelco Dolstra
49a059d426
Merge pull request #110 from DeterminateSystems/fix-fetcher-cache
Fix broken fetchToStore() caching
2025-06-13 22:30:30 +00:00
Eelco Dolstra
8b9cb382e9 Fix path field in fetcher cache
86785fd9d1 was broken because it was
storing the full path in the MountedSourceAccessor as the `path` field
in the fetcher cache key (i.e. including the
/nix/store/... prefix). Especially in the case of lazy (virtual) store
paths, this didn't work at all because those paths are different every time.
2025-06-13 22:29:20 +02:00
Eelco Dolstra
cbedb8e19a Fix broken fetchToStore() caching on unlocked inputs 2025-06-13 22:29:20 +02:00
Graham Christensen
e84daa23f7
Merge pull request #112 from DeterminateSystems/push-xrtwsoznmtqt
Move the actual vm tests / flake regressions into the generic build phase
2025-06-13 19:36:22 +00:00
Graham Christensen
8aa7d7d5cc Go back to github hosted runners... blacksmith's keep dying 2025-06-13 15:27:23 -04:00
Eelco Dolstra
b2c762cd2f
Apply suggestions from code review
Co-authored-by: Luc Perkins <lucperkins@gmail.com>
2025-06-13 21:03:58 +02:00
Graham Christensen
ff5f65dac8 Move the actual vm tests / flake regressions into the generic build phase
This lets these steps run in maximal parallelism.

This also uses a success job to "combine" all the component jobs into a single signal.

This also collapses the publish step into the ci job so we don't double-run
2025-06-13 14:27:26 -04: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
b3b5dd6665
Merge pull request #111 from DeterminateSystems/push-suswmmmyvmxm
Fixup the complainy docs line
2025-06-13 14:45:43 +00:00
Graham Christensen
37ab15a9f3 Drop the complainy 3.6.3 line 2025-06-13 09:33:34 -04:00
jayeshv
699db04df3
Fix a minor typo 2025-06-13 12:28:27 +02:00
Jörg Thalheim
a1fe09d2c8
Merge pull request #13350 from xokdvium/meson-format
flake: Add meson formatter
2025-06-13 11:37:32 +02:00
Jörg Thalheim
84743c84c0
Merge pull request #13351 from drupol/push-rrzylpqynznw
docker: make sure `nix config check` works
2025-06-13 07:41:27 +02:00
Jörg Thalheim
82397e220d
Merge branch 'master' into push-rrzylpqynznw 2025-06-13 07:06:11 +02:00
Jörg Thalheim
918ac6b2fc
Merge pull request #13354 from drupol/push-sopslzmmlqxu
docker: use `callPackage`, parametrise the image build
2025-06-13 07:03:23 +02:00
Jörg Thalheim
d12e42489a
Merge pull request #13360 from xokdvium/duplicate-list-elems-overload
libexpr: Remove non-const overload of `listElems`
2025-06-13 07:03:03 +02:00
John Ericson
f8c1ac9515 Introduce top-level structuredAttrs field in JSON derivation format
Makes the behavoral change of #13263 without the underlying refactor.
Hopefully this clearly safe from a perf and GC perspective, and will
make it easier to benchmark #13263.
2025-06-12 20:45:47 -04:00
Graham Christensen
1533b85da3
Merge pull request #109 from DeterminateSystems/release-v3.6.4/afc44aa9-a290-409e-90f9-a3497b03c021
Release v3.6.4
2025-06-12 23:57:13 +00:00