nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-23 02:39:37 +01:00
Code Activity
21470 commits 185 branches 219 tags 158 MiB
Commit graph

21470 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Graham Christensen
da67f596de Mark 3.6.3 as revoked, and use its notes for 3.6.4 2025-06-12 19:54:50 -04:00
github-actions[bot]
ac5cbe7c88
Generare release notes for 3.6.4 2025-06-12 23:23:32 +00:00
github-actions[bot]
17de8fd29c
Set .version-determinate to 3.6.4 2025-06-12 23:23:27 +00:00
github-actions[bot]
760e6e5f1e
Prepare release v3.6.4 2025-06-12 23:23:24 +00:00
Sergei Zimmerman
7b46eb9958
libexpr: Remove non-const overload of listElems 
This overload isn't actually necessary anywhere and
doesn't make much sense. The pointers to `Value`s are
themselves const, but the `Value`s are mutable.
A non-const member function implies that the object itself
can be modified but this doesn't make much sense considering
the return type: `Value * const * `, which is a pointer
to a constant array of pointers to mutable values.
 2025-06-12 22:29:05 +00:00
Robert Hensing
c437e27abc
Merge pull request #13357 from xokdvium/more-getters 
libexpr: Use more `Value` getters instead of reading `payload` directly (NFC)
 2025-06-12 23:03:20 +02:00
Sergei Zimmerman
bc6b52aff0
libexpr: Add and use pathAccessor getter 2025-06-12 20:01:38 +00:00
Sergei Zimmerman
e4df189123
libexpr: Add and use pathStr getter 2025-06-12 19:57:46 +00:00
Sergei Zimmerman
c041d71406
libexpr: Add and use app getter 2025-06-12 19:53:44 +00:00
Sergei Zimmerman
f07a9f863e
libexpr: Add and use primOpApp getter 2025-06-12 19:51:44 +00:00
Sergei Zimmerman
441fa86e82
libexpr: Add and use thunk getter 2025-06-12 19:48:42 +00:00
Sergei Zimmerman
6587e7bcff
libexpr: Add and use lambda getter 2025-06-12 19:42:50 +00:00
Samuli Thomasson
0f6cb33763
fix throwing output paths out of sandbox paths 
It seems obvious that erasing any output paths from pathsInChroot needs
to happen after getPathsInSandbox(), not before.

Signed-off-by: Samuli Thomasson <samuli.thomasson@pm.me>
 2025-06-12 21:36:04 +02:00
Graham Christensen
60257ecd17
Merge pull request #106 from DeterminateSystems/release-v3.6.3/1649aa00-94c6-44df-b2b1-12e5750b76fc 
Release v3.6.3
 2025-06-12 18:48:34 +00: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
Eelco Dolstra
a572c94333 Fix deep overrides 
An override like

  inputs.foo.inputs.bar.inputs.nixpkgs.follows = "nixpkgs";

implicitly set `inputs.foo.inputs.bar` to `flake:bar`, which led to an
unexpected error like

  error: cannot find flake 'flake:bar' in the flake registries

We now no longer create a parent override (like for `foo.bar` in the
example above) if it doesn't set an explicit ref or follows
attribute. We only recursively apply its child overrides.

Fixes https://github.com/NixOS/nix/issues/8325, https://github.com/DeterminateSystems/nix-src/issues/95, https://github.com/NixOS/nix/issues/12083, https://github.com/NixOS/nix/issues/5790.
 2025-06-12 20:32:58 +02:00
Pol Dellaiera
6eb4ee6855 docker: replace git with gitMinimal 2025-06-12 19:50:52 +02:00
Pol Dellaiera
5862f38d00 docker: use callPackage, parametrise the image build 2025-06-12 19:50:31 +02:00
Graham Christensen
642d1bdfb2
Update doc/manual/source/release-notes-determinate/rl-3.6.3.md 2025-06-12 13:23:39 -04:00
Pol Dellaiera
5abaf361a4 docker: reduce duplicates, use coreutils-full 2025-06-12 19:06:48 +02:00
Graham Christensen
b9e876768f
Merge pull request #107 from DeterminateSystems/fix-typo 
Re-supply inadvertently deleted word
 2025-06-12 16:49:26 +00:00