Eelco Dolstra
a691dcf48f
Run all of hydraJobs.tests.*
2025-02-20 16:08:07 +01:00
John Ericson
0d6428821a
Merge pull request #12533 from obsidiansystems/eval-store-path-path
...
Introduce `EvalStore::storePath`
2025-02-20 01:24:39 -05:00
John Ericson
de22f58dfc
Introduce EvalStore::storePath
...
This abstracts over a common case. Good for brevity, and enabling
further experiments.
2025-02-19 21:24:26 -05:00
John Ericson
782c63fc8e
Merge pull request #12512 from DeterminateSystems/store-fs
...
Use a union source accessor to put chroot stores in the logical location
2025-02-19 19:47:49 -05:00
Eelco Dolstra
ec7dc56f4e
Remove unused variable
2025-02-20 01:09:18 +01:00
Eelco Dolstra
8dc2b2715b
In pure eval mode, restrict rootFS to just the Nix store
...
Note that in pure mode, we don't need to use the union FS even when
using a chroot store, since the user shouldn't have access to the
physical /nix/store.
2025-02-19 23:13:11 +01:00
Eelco Dolstra
4206d95996
Remove sourcePathToStorePath()
...
It's no longer needed now that all store paths inside the evaluator
are logical rather than real paths.
2025-02-19 21:31:25 +01:00
mergify[bot]
514f1dea44
Merge pull request #12530 from NixOS/mergify/bp/2.26-maintenance/pr-12439
...
Set FD_CLOEXEC on sockets created by curl (backport #12439 )
2025-02-19 20:24:14 +00:00
MaxHearnden
cd149b56c7
Set FD_CLOEXEC on sockets created by curl
...
Curl creates sockets without setting FD_CLOEXEC/SOCK_CLOEXEC, this can
cause connections to remain open forever when using commands like `nix
shell`
This change sets the FD_CLOEXEC flag using a CURLOPT_SOCKOPTFUNCTION
callback.
(cherry picked from commit 12d2527276
2025-02-19 19:47:45 +00:00
Eelco Dolstra
584ddd1b4d
UnionSourceAccessor: Don't filter out underlying files of the wrong type
...
https://github.com/NixOS/nix/pull/12512#discussion_r1961567140
2025-02-19 13:34:42 +01:00
Eelco Dolstra
99e78c37f7
Use UnionSourceAccessor to mount the chroot store on top of the real store directory
2025-02-19 12:54:09 +01:00
Eelco Dolstra
5b7c240ebd
Add a UnionSourceAccessor
2025-02-19 12:54:09 +01:00
Eelco Dolstra
c3d8799f9f
MountedSourceAccessor: Remove redundant pathExists() method
2025-02-19 12:47:28 +01:00
Eelco Dolstra
641733fd26
Add test
2025-02-19 12:47:28 +01:00
Eelco Dolstra
774b924398
Add a storeFS accessor for paths resulting from IFD
...
Hopefully fixes #11503 .
2025-02-19 12:47:28 +01:00
Eelco Dolstra
e5e0ce2334
Remove redundant call to canonPath()
...
The CanonPath constructor already does that.
2025-02-19 12:47:28 +01:00
Eelco Dolstra
e5fdb4b164
Merge pull request #12524 from NixOS/remove-nixfmt-override
...
Remove nixfmt override
2025-02-19 12:45:12 +01:00
Eelco Dolstra
2b3fed4622
Merge pull request #12525 from DeterminateSystems/move-mounted-source-accessor
...
MountedSourceAccessor: Move to libutil
2025-02-19 11:11:55 +01:00
Eelco Dolstra
d7f2c1b7f4
Remove mounted-source-accessor.hh
2025-02-19 10:44:46 +01:00
Eelco Dolstra
0da81343d7
Move MountedSourceAccessor to libutil
2025-02-19 10:44:42 +01:00
Eelco Dolstra
7202f11c74
Merge pull request #47 from DeterminateSystems/test-on-x86_64-darwin
...
Test on x86_64-darwin
2025-02-19 10:41:04 +01:00
Robert Hensing
573ffac2e6
Remove nixfmt override
...
Closes https://github.com/NixOS/nix/issues/12418
IFD in nixfmt repo
2025-02-19 10:29:58 +01:00
mergify[bot]
029dd96b8b
Merge pull request #12523 from NixOS/mergify/bp/2.26-maintenance/pr-12518
...
packaging: Restore libgit2 USE_SSH=exec (backport #12518 )
2025-02-19 09:14:56 +00:00
Robert Hensing
8028579060
packaging: Restore libgit2 USE_SSH=exec
...
... when nixpkgs is nixos-unstable or the overlay is used.
(cherry picked from commit 5488e29d2f
2025-02-19 08:54:28 +00:00
Robert Hensing
f201446983
Merge pull request #12518 from roberth/libgit2-use-ssh-exec
...
packaging: Restore libgit2 USE_SSH=exec
2025-02-19 09:53:41 +01:00
Robert Hensing
5488e29d2f
packaging: Restore libgit2 USE_SSH=exec
...
... when nixpkgs is nixos-unstable or the overlay is used.
2025-02-19 09:38:05 +01:00
Eelco Dolstra
0339ba582e
magic-nix-cache-action -> flakehub-cache-action
2025-02-19 09:09:57 +01:00
mergify[bot]
dae4dac76e
Merge pull request #12519 from NixOS/mergify/bp/2.26-maintenance/pr-12503
...
Overriding the componentized build (backport #12503 )
2025-02-19 00:59:46 +00:00
Robert Hensing
244735270a
packaging: Remove dead code
...
... from nixpkgs, my bad.
(cherry picked from commit f0bdb65216
2025-02-19 01:33:20 +01:00
Robert Hensing
dade40573e
packaging: Make patch count lazier
...
This makes `nix.version` quicker to evaluate, which should speed up
package listing operations.
If you want an accurate count, use `lib.optionals` in your override
instead of `null` values.
(cherry picked from commit d47e3c9576
2025-02-19 01:33:20 +01:00
Robert Hensing
bfb6f37b37
packaging: Add patch count to version
...
(cherry picked from commit 0dbe28ad9d
2025-02-19 01:33:20 +01:00
Robert Hensing
a4641be4e9
test: Ignore packaging-overriding check on darwin for now
...
(cherry picked from commit 03efba30da
2025-02-19 01:33:20 +01:00
Robert Hensing
cc3fb61249
packaging: Add source overriding "methods"
...
(cherry picked from commit 48fb6fdde9
2025-02-19 01:33:20 +01:00
Robert Hensing
44fb647986
packaging: Add overrideAllMesonComponents
...
(cherry picked from commit f31d86284f
2025-02-19 01:32:53 +01:00
Robert Hensing
540e8cb908
packaging: Move layers from dependencies to components
...
This makes it easier to implement batch overriding for the components.
(cherry picked from commit cca01407a7
2025-02-19 01:32:40 +01:00
mergify[bot]
8a2bb811ac
Merge pull request #12506 from NixOS/mergify/bp/2.26-maintenance/pr-12498
...
Restore detailed Nix CLI version (backport #12498 )
2025-02-19 00:29:13 +00:00
Robert Hensing
fd062585ac
tests: Fix installTests
...
(cherry picked from commit 2b5365bcf7
2025-02-19 01:04:04 +01:00
Robert Hensing
b175e5bb6d
Write just ./.version on all components
...
This way it's easier to get right. See previous commit.
(cherry picked from commit 3556f6bf4c
2025-02-19 01:04:04 +01:00
Robert Hensing
21998464b7
Restore detailed Nix CLI version
...
... as intended.
Requirements:
- don't build fresh libraries for each git commit
- have git commit in the CLI
Bug:
- echo ${version} went into the wrong file => use the fact that it's
a symlink, not just for reading but also for writing.
(cherry picked from commit bba4e6b061
2025-02-19 01:04:02 +01:00
Eelco Dolstra
eabca75d0c
Test on x86_64-darwin
2025-02-19 00:52:32 +01:00
Eelco Dolstra
9810098740
Merge pull request #46 from DeterminateSystems/sync-2.26.2
...
Sync with Nix 2.26.2
2025-02-19 00:48:57 +01:00
Robert Hensing
e672243bed
Merge pull request #12503 from roberth/overriding
...
Overriding the componentized build
2025-02-19 00:42:34 +01:00
mergify[bot]
d6a66b366e
Merge pull request #12517 from NixOS/mergify/bp/2.26-maintenance/pr-12484
...
Support libgit2 1.9.0 (backport #12484 )
2025-02-18 23:30:27 +00:00
Eelco Dolstra
a3cd93749f
Fix flake-regression dependency
2025-02-19 00:26:06 +01:00
Eelco Dolstra
ed4aeb4875
Fix hydraJobs.tests.functional_user
2025-02-19 00:26:06 +01:00
Eelco Dolstra
6c61d0ab8c
Formatting
2025-02-19 00:26:06 +01:00
Robert Hensing
cc3ad9bd3a
Support libgit2 1.9.0
...
For when the overlay is used with nixos-unstable.
1.9.0 has our patches.
(cherry picked from commit b0bbb1252a
2025-02-18 23:16:12 +00:00
Robert Hensing
f0bdb65216
packaging: Remove dead code
...
... from nixpkgs, my bad.
2025-02-19 00:10:05 +01:00
John Ericson
5aeaa25309
Merge pull request #12513 from tweag/ccacheStdenv-typo
...
doc: Fix `ccacheStdenvPackages` typo
2025-02-18 17:44:42 -05:00
Silvan Mosberger
c19914f1ab
doc: Fix ccacheStdenvPackages typo
2025-02-18 23:23:10 +01:00
