nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-10 20:46:01 +01:00
Code Activity
21542 commits 179 branches 218 tags 166 MiB
Commit graph

21542 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eelco Dolstra
2f6c758d3d Revert "Drop magic-nix-cache" 
This reverts commit 9cc8be2674 since
magic-nix-cache works again (thanks @jchv).

(cherry picked from commit 9b57573bae)
 2025-06-19 12:12:28 +00:00
Jörg Thalheim
a8a5537109
Merge pull request #13376 from NixOS/use-magic-nix-cache 
Revert "Drop magic-nix-cache"
 2025-06-19 14:10:55 +02:00
Eelco Dolstra
20ba6be749 Improve the Rosetta installation hint 
The Nix daemon detects supported system types at start time, so it
needs to be restarted to detect x86_64-darwin support.
 2025-06-19 13:58:51 +02:00
John Ericson
d254c840b5
Merge pull request #13349 from obsidiansystems/structured-attrs-json 
Introduce top-level `structuredAttrs` field in JSON derivation format
 2025-06-18 16:35:42 -04:00
Eelco Dolstra
9b57573bae Revert "Drop magic-nix-cache" 
This reverts commit 9cc8be2674 since
magic-nix-cache works again (thanks @jchv).
 2025-06-18 18:06:24 +02:00
Eelco Dolstra
fc47178d0d
Merge pull request #13372 from synalice/patch-1 
Fix broken link
 2025-06-18 17:54:04 +02:00
Eelco Dolstra
197484ce1f
Merge pull request #13373 from synalice/patch-2 
Fix typo
 2025-06-18 17:52:38 +02:00
mergify[bot]
4c7e5ce7a8
Merge pull request #13375 from NixOS/mergify/bp/2.29-maintenance/pr-13371 
tests: fixup with jq-1.8.0 (backport #13371)
 2025-06-18 15:51:12 +00:00
Luc Perkins
d6710b4c04
Merge remote-tracking branch 'upstream/master' into messages-present-tense 2025-06-18 08:24:23 -07:00
Luc Perkins
d2a25fbe51
Fix Nix formatting changes 2025-06-18 08:23:37 -07:00
Vladimír Čunát
86fbaf3b14 tests: fixup with jq-1.8.0 
(cherry picked from commit 77f6b6532f)
 2025-06-18 15:18:06 +00:00
Eelco Dolstra
cd97c545d9
Merge pull request #13371 from vcunat/p/jq-1.8.0_master 
tests: fixup with jq-1.8.0
 2025-06-18 17:17:24 +02:00
Nikita Krasnov
86dda9884a
Fix typo 2025-06-18 12:46:53 +03:00
Nikita Krasnov
da76bc0cac
Fix broken link 2025-06-18 12:40:07 +03:00
Vladimír Čunát
77f6b6532f
tests: fixup with jq-1.8.0 2025-06-18 10:11:50 +02:00
Graham Christensen
fc2d5a18d1
Merge pull request #121 from DeterminateSystems/release-v3.6.6/3dd48fe2-439e-4ecf-884f-aec379a22d28 
Release v3.6.6
 2025-06-17 23:08:38 +00:00
Graham Christensen
cd0128796a
Apply suggestions from code review 2025-06-17 18:21:01 -04:00
github-actions[bot]
f9b88e3229
Generate release notes for 3.6.6 2025-06-17 22:16:00 +00:00
github-actions[bot]
97af07180c
Set .version-determinate to 3.6.6 2025-06-17 22:15:55 +00:00
github-actions[bot]
1eab4236d4
Prepare release v3.6.6 2025-06-17 22:15:52 +00:00
Eelco Dolstra
5842d54cee Drop bad std::move 
Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
 2025-06-17 08:34:34 -07:00
Eelco Dolstra
a0fb93f09b Make sandbox error messages more readable 2025-06-17 08:34:34 -07:00
Eelco Dolstra
803d461e95 Add external builders 
These are helper programs that execute derivations for specified
system types (e.g. using QEMU to emulate another system type).

To use, set `external-builders`:

  external-builders = [{"systems": ["aarch64-linux"], "program": "/path/to/external-builder.py"}]

The external builder gets one command line argument, the path to a JSON file containing all necessary information about the derivation:

  {
    "args": [...],
    "builder": "/nix/store/kwcyvgdg98n98hqapaz8sw92pc2s78x6-bash-5.2p37/bin/bash",
    "env": {
      "HOME": "/homeless-shelter",
      ...
    },
    "realStoreDir": "/tmp/nix/nix/store",
    "storeDir": "/nix/store",
    "tmpDir": "/tmp/nix-shell.dzQ2hE/nix-build-patchelf-0.14.3.drv-46/build",
    "tmpDirInSandbox": "/build"
  }
 2025-06-17 08:34:34 -07:00
Eelco Dolstra
95f87abf66 Cleanup 2025-06-17 08:34:34 -07:00
Eelco Dolstra
d0a263711a Remove unused variable 2025-06-17 08:34:34 -07:00
Eelco Dolstra
21fd152279 Fix macOS build 2025-06-17 08:34:34 -07:00
Eelco Dolstra
ab18d8ca5f Move cgroup support 2025-06-17 08:34:34 -07:00
Eelco Dolstra
c9bb16a741 Inline initTmpDir() 2025-06-17 08:34:34 -07:00
Eelco Dolstra
492b684b9e Get rid of tmpDirInSandbox variable 2025-06-17 08:34:34 -07:00
Eelco Dolstra
f5176500be Move autoDelChroot 2025-06-17 08:34:34 -07:00
Eelco Dolstra
5d96e55e91 Move seccomp code 2025-06-17 08:34:34 -07:00
Eelco Dolstra
1acdb9168d Move doBind() 2025-06-17 08:34:34 -07:00
Eelco Dolstra
305a9680e4 Eliminate useChroot 2025-06-17 08:34:34 -07:00
Eelco Dolstra
2d5d3e44dd Move pathsInChroot 2025-06-17 08:34:34 -07:00
Eelco Dolstra
3733f95ae5 DerivationBuilder: Move Linux/Darwin-specific code into subclasses 2025-06-17 08:22:32 -07:00
Eelco Dolstra
af1b580ff6 DerivationBuilderImpl: Drop std::optional from derivationType 
No point in computing this lazily, since it's pretty much the first
thing the DerivationBuilder does.
 2025-06-17 08:22:32 -07:00
Eelco Dolstra
189fdfa776 Remove duplicate comments on DerivationBuilderImpl overriden methods 
Having the exact same doc comments isn't very useful/maintainable.
 2025-06-17 08:22:32 -07:00
Eelco Dolstra
c6617d6f2e Remove buildUser from DerivationBuilder 
The use of a `buildUser` is an implementation detail of some types of
sandboxes that shouldn't exposed.
 2025-06-17 08:22:32 -07:00
Eelco Dolstra
bb32fcdf30
Merge pull request #13368 from wolfgangwalther/race-state-creation 
libstore: fix race condition when creating state directories
 2025-06-17 11:33:29 +02:00
Eelco Dolstra
59c7dac867 Git fetcher: Do not consider a null revision (i.e. workdir) to be locked 2025-06-17 10:55:23 +02:00
Wolfgang Walther
d64c922164
libstore: fix race condition when creating state directories 
Running parallel nix in nix can lead to multiple instances trying to
create the state directories and failing on the `createSymlink` step,
because the link already exists.

`replaceSymlink` is already idempotent, so let's use that.

Resolves #2706
 2025-06-17 08:45:29 +02:00
John Ericson
cdb417854b
Merge pull request #13366 from drupol/push-smvorxlvxusx 
docker: add basics OpenContainers labels
 2025-06-16 18:11:53 -04:00
Eelco Dolstra
3a4e6cadeb Improve regression testing for uncachable source paths 
These now throw an error by default in the test suite.
 2025-06-16 23:59:33 +02:00
Eelco Dolstra
a175c67def Fix rootFS fingerprint in the impure case 2025-06-16 23:59:33 +02:00
Eelco Dolstra
5329a45ade Git fetcher: Make dirty repos with no commits cacheable 2025-06-16 23:59:33 +02:00
Graham Christensen
7469e7aa57
Merge pull request #119 from DeterminateSystems/release-v3.6.5/c7ec4397-7427-42b1-87fb-1266bc444391 
Release v3.6.5
 2025-06-16 21:29:31 +00:00
Graham Christensen
0f3892185d Add a final newline in the generated release notes 2025-06-16 17:21:26 -04:00
Graham Christensen
c0e53f3312 Move the 3.6.4 notes over 2025-06-16 17:20:06 -04:00
Graham Christensen
97e2e9159b Fixup generar->te in commit automation 2025-06-16 17:17:42 -04:00
Graham Christensen
fe6972f6f0 Fixup type (generare) 2025-06-16 17:16:25 -04:00