nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-16 22:11:05 +01:00
Code Activity
20169 commits 198 branches 220 tags 161 MiB
Commit graph

11983 commits

Author SHA1 Message Date
Eelco Dolstra
88cd82239e Fix the nix-community/patsh/0.2.1 flake regression test (again) 2025-04-25 16:50:02 +02:00
Eelco Dolstra
2aa3655166 computeBaseName(): Respect the original store path name 2025-04-24 17:08:33 +02:00
Eelco Dolstra
9d87ab1dc8 Add a setting to enable lazy trees 2025-04-24 16:16:28 +02:00
Eelco Dolstra
182edb4dee Move mountInput into EvalState 2025-04-23 13:53:29 +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
43a26916c2 unsafeGetAttrPos: Set string context on store paths 
This is needed to devirtualize them when they get passed to a
derivation or builtins.toFile. Arguably, since this builtin is unsafe,
we could just ignore this, but we may as well do the correct thing.
 2025-04-18 16:01:19 +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
John Ericson
29ae14114e Remove stray assignment side affect in lambda 
This was almost a bug! It wasn't simply because another assignment would
clobber it later.

(cherry picked from commit 32409dd7d7)
 2025-04-15 14:25:16 -04:00
John Ericson
30d900b313 Derivation "advanced attrs" test: Ensure fields are set to distinct values 
We had fields set to the same values before in our test data. This is
not a problem per-se, but does mean we wouldn't catch certain mixups.
Now, the fields are set to distinct values (where possible), which makes
the test more robust.

(cherry picked from commit a0b2b75f59)
 2025-04-15 14:25:13 -04:00
Eelco Dolstra
0c0dda3b29 Devirtualize double-copied paths 
Borrowed from the original lazy-trees branch.
 2025-04-15 17:44:56 +02:00
John Ericson
f19184191e Test derivation options with content-addressing too 
Now, both the unit and functional tests relating to derivation options
are tested both ways -- with input addressing and content-addressing
derivations.

(cherry picked from commit 307dbe9914)
 2025-04-15 11:25:07 -04:00
Eelco Dolstra
5ecbf6b9dc
Merge pull request #13029 from NixOS/mergify/bp/2.28-maintenance/pr-13026 
Fix issue #13018, `sourceInfo` strict in `outputs` (backport #13026)
 2025-04-15 14:24:59 +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
671364748c call-flake.nix: allNodes.${key} -> allNodes.${key}.result 
(cherry picked from commit 9de9410f29)
 2025-04-15 11:52:45 +00:00
Robert Hensing
9a969e29cf call-flake.nix: refactor: Bring mapAttrs into scope 
(cherry picked from commit 674375b021)
 2025-04-15 11:52:45 +00:00
Philipp Otterbein
a603401cdd libstore: curl retry: reset content-encoding and don't use string after move 
(cherry picked from commit b129fc8237)
 2025-04-15 11:22:25 +00:00
Eelco Dolstra
e099a5bc67 Move the InputCache to EvalState 2025-04-14 15:02:24 +02:00
Philipp Otterbein
61bb405839 add isInterrupted() call and replace some checkInterrupt() occurrences 
(cherry picked from commit 49f757c24a)
 2025-04-11 22:15:12 +00:00
Philipp Otterbein
c53bd8905b libstore: same progress bar behavior for PUT and POST requests 
- no differentiation between uploads and downloads in CLI

(cherry picked from commit db297d3dda)
 2025-04-11 22:15:12 +00:00
Philipp Otterbein
beab9eb978 libstore S3: fix progress bar and make file transfers interruptible 
(cherry picked from commit 9da01e69f9)
 2025-04-11 22:15:11 +00:00
Eelco Dolstra
497fe6dd31 Make nix profile install an alias of nix profile add 2025-04-10 18:48:23 +02:00
Eelco Dolstra
666aa20da8 Move alias support from NixArgs to MultiCommand 
This allows subcommands to declare aliases, e.g. `nix store ping` is
now a proper alias of `nix store info`.
 2025-04-10 18:48:23 +02:00
Eelco Dolstra
62565ce7ce Remove unused variable 2025-04-10 13:10:20 +02:00
Eelco Dolstra
dd15c8a20d Move getAccessorCached() to InputCache 
Also, make fetchTree use InputCache.
 2025-04-09 23:06:03 +02:00
John Ericson
f9c262c3d5 Fix another machine config parsing bug 
We were ignorning the result of `trim`, and after my last change we were
also trimmming too early.

(cherry picked from commit b74b0f4e1c)
 2025-04-09 20:13:30 +00:00
Eelco Dolstra
3bbf917707 Move the input cache into libfetchers 2025-04-09 22:13:28 +02:00
Eelco Dolstra
0cb06d7eda Rename FlakeCache -> InputCache and key it on Inputs instead of FlakeRefs 2025-04-09 21:38:08 +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
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
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
f058567e9a Fix printAmbiguous() / printValueAsJSON() 2025-04-09 00:15:08 +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
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
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
Eelco Dolstra
85902fad58 Fix some clang-tidy warnings 
(cherry picked from commit c0ad5d36c4)
 2025-04-07 20:38:07 +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
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
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
Graham Christensen
8443f01536 Rename nix profile install to nix profile add. 2025-04-07 09:22:57 -04:00
Eelco Dolstra
59d1634aab Tagging release 2.28.1 
-----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCAAxFiEEtUHVUwEnDgvPFcpdgXC0cm1xmN4FAmfzku8THGVkb2xzdHJh
 QGdtYWlsLmNvbQAKCRCBcLRybXGY3ngWB/0e5vMSgZtARQXjuyexyJyy2m8JIQzJ
 Stw7dP0/oAvWYWuytez3jX4KC9xztMELblgZzXQhO72wIfzpa/CmxWQXVSaHm6Kq
 zYAWhxXz2HKGEPd8bS6eCFCZcrmChso7UN2WjrROYwB+1HO5S1rtOJtv2K1zvy5C
 xRMoOpSfKVfn63FoODhenW3UWbfeck5Dmb6eirPxvIMUIcDi2FeX5MVlklgNhxum
 351/Ymo5dxyK1pGmm8NrvB/3RSk7rVRUR+R4257lCmrN0g4gvM0G4MvxGm+XHMmC
 d/tmeU+JKPiXKFDSWmuTCmwCenu/q95QRadKST+Wls+qc4gHQLCaXfgn
 =hcKx
 -----END PGP SIGNATURE-----

Merge tag '2.28.1' into sync-2.28.0

Tagging release 2.28.1
 2025-04-07 11:21:07 +02:00
Eelco Dolstra
e3a8e43600
Merge pull request #12942 from NixOS/mergify/bp/2.28-maintenance/pr-12936 
libflake: add lock file path to invalid json error (backport #12936)
 2025-04-07 09:57:33 +02:00
John Ericson
efb0feb22b Get rid of raw -D defines, always use private config files 
Now that we have the private vs public distinction, we can do this
without leaking information downstream.

(cherry picked from commit 7a7fe350d5)
 2025-04-07 00:10:38 +00:00
John Ericson
7e96f31753 Clean some header related things. 
Revert most of "Hack together a fix for the public headers"

- The `libmain` change is kept, and one more libmain change is made.
  (Need to update Meson and Nix per the package alike).

- The S3 situation is fixed in a different way: the variable is public
  now, used in the header, and fixed accordingly.

- Fix TODO for `HAVE_EMBEDDED_SANDBOX_SHELL`

This reverts commit 2b51250534.

(cherry picked from commit 3294b22a68)
 2025-04-07 00:10:37 +00:00
Alexander Romanov
49b6766332 libflake: add lock file path to invalid json error 
Previously, when lock file contained invalid JSON nix reported a parser
error without specifying the file it came from.

This change adds flake.lock file path to the error message to avoid
confusion.

(cherry picked from commit e3873aa1a0)
 2025-04-06 23:33:35 +00:00
Robert Hensing
3bb46b73a8 Fix undefined macro errors 
(cherry picked from commit 77b4bb74d5)
 2025-04-06 16:25:51 +00:00
Robert Hensing
615344fdf0 Fix more -Wundef, in darwin context 2025-04-05 13:46:04 +02:00