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

21519 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eelco Dolstra
c1b0b15708 Merge remote-tracking branch 'detsys/detsys-main' into refactor-derivation-builder 2025-07-15 18:52:12 +02:00
Eelco Dolstra
35a8e9c71e
Merge pull request #141 from DeterminateSystems/external-builder-stdin 
Add an `external-builders` experimental feature
 2025-07-14 22:42:21 +02:00
Cole Helbling
dedc3b2fb0
Merge pull request #148 from DeterminateSystems/conditional-manual 
Only build the manual on x86_64-linux
 2025-07-14 18:27:26 +00:00
Cole Helbling
de158c335c fixup: document why we're not writing through stdin right now 2025-07-14 11:13:04 -07:00
Cole Helbling
5b27325bc2 Revert "external-derivation-builder: write the json doc into builder's stdin" 
This reverts commit d1f57c5dae.
 2025-07-14 11:00:13 -07:00
Eelco Dolstra
b029442553 Only build the manual on x86_64-linux 
Otherwise the build will randomly fail on other platforms depending on
whether the result is already in the binary cache.
 2025-07-14 19:55:33 +02:00
Cole Helbling
efa239875b Add an external-builders experimental feature 2025-07-14 09:07:32 -07:00
detsys-spaghetti[bot]
04045d5add
Merge pull request #147 from DeterminateSystems/release-v3.8.2/f8796ebd-ce7e-4551-a225-409806f242ea 
Release v3.8.2
 2025-07-12 14:16:53 +00:00
Cole Helbling
adab14705e
Merge pull request #146 from DeterminateSystems/sync-2.30.1 
Sync with 2.30.1
 2025-07-12 13:54:45 +00:00
github-actions[bot]
db0c2efeb4
Generate release notes for 3.8.2 2025-07-12 13:51:21 +00:00
github-actions[bot]
86fe0053f8
Set .version-determinate to 3.8.2 2025-07-12 13:51:16 +00:00
github-actions[bot]
e25be4a49c
Prepare release v3.8.2 2025-07-12 13:51:13 +00:00
Eelco Dolstra
dea86cd473 Tagging release 2.30.1 
-----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCAAxFiEEtUHVUwEnDgvPFcpdgXC0cm1xmN4FAmhyEcITHGVkb2xzdHJh
 QGdtYWlsLmNvbQAKCRCBcLRybXGY3lZeB/9D/FGpanG1tE/RgqJjJSrw0YKRPhFu
 +Qo+vCbW+ZjFdbXTHnWynpCO3/HJDf4AsXiSgUnhckS54hUZ2p10JIjOdCCWA8yh
 aZfBEfX8xWmgUU8tEbRVluUjwfTRVmuf+Y2znvoS++Ej2sNxip8I/gcd5nPb1G5M
 EEFB+/JKNVnFGdGwLdn5q6Ih5Z3XbnLHiSKMKCLhZTCBU6PWwpHbFgDgqreGNHyr
 jMkl2RFLzLvZhzIF7EYtO0PPDXWeDceQDrYzJKXYcWKHlrywAV6lGvKKhKW8l6OU
 a06c+I99M4LNIFK7ENraI2V408miRTvXmLPSQjCtkM1NM9+/cNZRtRlW
 =aYgN
 -----END PGP SIGNATURE-----

Merge tag '2.30.1' into sync-2.30.1

Tagging release 2.30.1
 2025-07-12 12:53:18 +02:00
Eelco Dolstra
857365c859
Merge pull request #13458 from NixOS/mergify/bp/2.30-maintenance/pr-13455 
Address ifdef problem with macOS/BSD sandboxing (backport #13455)
 2025-07-12 08:55:18 +02:00
Graham Christensen
15871addd5
Merge pull request #145 from DeterminateSystems/push-lxmxkysvvluw 
Try publishing the manual again
 2025-07-12 00:34:31 +00:00
Graham Christensen
b96c3e4657 Maybe this helps 2025-07-11 20:27:37 -04:00
Graham Christensen
37071b2d2d Try publishing the manual again 2025-07-11 20:19:53 -04:00
Graham Christensen
2fc9a606e1
Merge pull request #144 from DeterminateSystems/grahamc-patch-1 
ci: don't run the full test suite for x86_64-darwin
 2025-07-12 00:08:49 +00:00
Graham Christensen
bbc9d6c4f5
ci: don't run the full test suite for x86_64-darwin 
Since this platform represents a tiny fraction of our users and causes considerable delays in our release flow, let's disable the more extensive test suite on that platform.
 2025-07-11 20:01:40 -04:00
detsys-spaghetti[bot]
8a1b94d705
Merge pull request #143 from DeterminateSystems/release-v3.8.1/2ab4e71d-c221-4d61-ab5e-4467bcc86717 
Release v3.8.1
 2025-07-11 23:19:09 +00:00
gustavderdrache
9497b593c6 CI: Roll nix version to 2.29.1 
This works around the macOS issue that the prior commit addresses.

(cherry picked from commit 8e5814d972)
 2025-07-11 23:09:58 +00:00
gustavderdrache
1cf202650a Address ifdef problem with macOS/BSD sandboxing 
(cherry picked from commit e2ef2cfcbc)
 2025-07-11 23:09:58 +00:00
github-actions[bot]
e6350604ba
Generate release notes for 3.8.1 2025-07-11 23:07:29 +00:00
github-actions[bot]
fd3e326fbf
Set .version-determinate to 3.8.1 2025-07-11 23:07:24 +00:00
github-actions[bot]
861b196bdc
Prepare release v3.8.1 2025-07-11 23:07:21 +00:00
Cole Helbling
ebcfa041fc
Merge pull request #142 from DeterminateSystems/gustavderdrache/push-twmsvkkqknuk 
Address ifdef problem with macOS/BSD sandboxing
 2025-07-11 22:37:27 +00:00
gustavderdrache
8e21e61a51 Address ifdef problem with macOS/BSD sandboxing 2025-07-11 18:01:51 -04:00
Sergei Zimmerman
eb3c004972
Merge pull request #13453 from NixOS/mergify/bp/2.30-maintenance/pr-13450 2025-07-11 22:16:10 +03:00
Sergei Zimmerman
382e25405a libexpr: Fix invalid handling of errors for imported functions 
c39cc00404 has added assertions for
all Value accesses and the following case has started failing with
an `unreachable`:

(/tmp/fun.nix):

```nix
{a}: a
```

```
$ nix eval --impure --expr 'import /tmp/fun.nix {a="a";b="b";}'
```

This would crash:

```
terminating due to unexpected unrecoverable internal error: Unexpected condition in getStorage at ../include/nix/expr/value.hh:844
```

This is not a regression, but rather surfaces an existing problem, which previously
was left undiagnosed. In the case of an import `fun` is the `import` primOp, so that read is invalid
and previously this resulted in an access into an inactive union member, which is UB.
The correct thing to use is `vCur`. Identical problem also affected the case of a missing argument.

Add previously failing test cases to the functional/lang test suite.

Fixes #13448.

(cherry picked from commit 6e78cc90d3)
 2025-07-11 18:26:57 +00:00
Cole Helbling
d1f57c5dae external-derivation-builder: write the json doc into builder's stdin 2025-07-11 10:37:58 -07:00
Eelco Dolstra
c8cab890fa
Merge pull request #13446 from NixOS/mergify/bp/2.30-maintenance/pr-13441 
fetchClosure: Fix gcc warning (backport #13441)
 2025-07-10 21:11:33 +02:00
Eelco Dolstra
7119d594fc fetchClosure: Fix gcc warning 
Fixes:

[261/394] Linking target src/libexpr/libnixexpr.so
In function ‘copy’,
    inlined from ‘__ct ’ at /nix/store/24sdvjs6rfqs69d21gdn437mb3vc0svh-gcc-14.2.1.20250322/include/c++/14.2.1.20250322/bits/basic_string.h:688:23,
    inlined from ‘operator+’ at /nix/store/24sdvjs6rfqs69d21gdn437mb3vc0svh-gcc-14.2.1.20250322/include/c++/14.2.1.20250322/bits/basic_string.h:3735:43,
    inlined from ‘operator()’ at ../src/libexpr/primops/fetchClosure.cc:127:58,
    inlined from ‘prim_fetchClosure’ at ../src/libexpr/primops/fetchClosure.cc:132:88:
/nix/store/24sdvjs6rfqs69d21gdn437mb3vc0svh-gcc-14.2.1.20250322/include/c++/14.2.1.20250322/bits/char_traits.h:427:56: warning: ‘__builtin_memcpy’ writing 74 bytes into a region of size 16 overflows the destination [-Wstringop-overflow=]
  427 |         return static_cast<char_type*>(__builtin_memcpy(__s1, __s2, __n));
      |                                                        ^
../src/libexpr/primops/fetchClosure.cc: In function ‘prim_fetchClosure’:
../src/libexpr/primops/fetchClosure.cc:132:88: note: at offset 16 into destination object ‘<anonymous>’ of size 32
  132 |             fromPath = state.coerceToStorePath(attr.pos, *attr.value, context, attrHint());
      |                                                                                        ^

(cherry picked from commit aa18dc54dc)
 2025-07-10 18:33:39 +00:00
Graham Christensen
2374da56fc
Merge pull request #140 from DeterminateSystems/release-v3.8.0/5087c9ef-5c71-4e74-ab80-c4344c05847c 
Release v3.8.0
 2025-07-10 15:48:35 +00:00
Eelco Dolstra
804729b4ec Merge remote-tracking branch 'detsys/detsys-main' into refactor-derivation-builder 2025-07-10 17:31:01 +02:00
Graham Christensen
8f31e84247 Update release notes 2025-07-10 11:27:54 -04:00
github-actions[bot]
c0dfe87d1d
Generate release notes for 3.8.0 2025-07-10 15:11:40 +00:00
github-actions[bot]
a78a2fdea1
Set .version-determinate to 3.8.0 2025-07-10 15:11:35 +00:00
github-actions[bot]
165afeec56
Prepare release v3.8.0 2025-07-10 15:11:32 +00:00
tomberek
f880135ff8
Merge pull request #13439 from NixOS/mergify/bp/2.30-maintenance/pr-13437 
lockFlake(): When updating a lock, respect the input's lock file (backport #13437)
 2025-07-10 01:03:55 -04:00
Eelco Dolstra
37487eec8e lockFlake(): When updating a lock, respect the input's lock file 
(cherry picked from commit 95437b90fc)
 2025-07-10 04:29:39 +00:00
Eelco Dolstra
930aabb7f3
Merge pull request #139 from DeterminateSystems/remove-dead 
Remove some dead code to minimize the upstream diff
 2025-07-09 20:25:49 +00:00
Eelco Dolstra
47081aa94c Remove some dead code to minimize the upstream diff 2025-07-09 22:12:05 +02:00
Cole Helbling
e1d45bb040
Merge pull request #138 from DeterminateSystems/hide-double-copy-warning 
Hide double copy warning
 2025-07-09 20:06:56 +00:00
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
700ceb2ce1 Hide double copy warning 2025-07-09 21:52:47 +02:00
Eelco Dolstra
668088b876
Merge pull request #134 from DeterminateSystems/nix-flake-check-dont-build 
nix flake check: Skip substitutable derivations
 2025-07-09 19:07:52 +00:00
Eelco Dolstra
2ecc5156f4 lockFlake(): When updating a lock, respect the input's lock file 2025-07-09 19:04:29 +02:00
Cole Helbling
063837069c
Merge pull request #135 from DeterminateSystems/sync-2.30.0 
Sync with upstream 2.30.0
 2025-07-09 16:44:44 +00:00
mergify[bot]
ed8f7df56d
Merge pull request #13436 from NixOS/mergify/bp/2.30-maintenance/pr-13435 
docker: fix nixConf (backport #13435)
 2025-07-09 09:50:14 +00:00
h0nIg
8b0cfaed9b docker: fix nixConf - fmt 
(cherry picked from commit 9857c0bb52)
 2025-07-09 09:18:28 +00:00