wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-29 02:11:15 +02:00
Code Activity
20080 commits 245 branches 205 tags 160 MiB
Commit graph

20080 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eelco Dolstra
0da6a4a0ec
Merge pull request #12540 from xokdvium/fix/devshell 
packaging: Fix devShell
 2025-02-20 21:53:46 +01:00
Eelco Dolstra
b6101aedb4
Merge pull request #49 from DeterminateSystems/use-blacksmith 
Run some jobs on blacksmith
 2025-02-20 20:43:52 +00:00
Eelco Dolstra
835b3b4efe Fix vm_tests_all 2025-02-20 21:39:01 +01:00
Sergei Zimmerman
d95b7fea8e libfetchers-tests: Add back git-utils.cc 
Seems like this got dropped at some point during meson migration, so
put it back in the build system.

Drop all tests for `parseGitUrl`, since that function doesn't exist
and migrating doesn't look sensible because git-lfs stuff seems to use
`ParsedURL`.
 2025-02-20 20:19:16 +00:00
Eelco Dolstra
3e39ac4fc9 Don't run vm_tests_smoke in the merge queue 2025-02-20 21:06:17 +01:00
Eelco Dolstra
10977365ff Run some jobs on blacksmith 2025-02-20 21:03:49 +01:00
Eelco Dolstra
9620c840cf
Merge pull request #48 from DeterminateSystems/run-all-vm-tests 
Run all of hydraJobs.tests.*
 2025-02-20 19:43:24 +00:00
Eelco Dolstra
4c39f29a4a Move more stuff to the merge queue 2025-02-20 20:33:01 +01:00
Eelco Dolstra
d9f742302e Add merge queue config 2025-02-20 20:24:51 +01:00
John Ericson
6877988515 Fix dev shell 
There was one `inputs.nixFmt` left after 573ffac2e6.
 2025-02-20 13:01:42 -05:00
mergify[bot]
0d039d4abe
Merge pull request #12537 from NixOS/mergify/bp/2.26-maintenance/pr-12391 
Only try to chmod /nix/var/nix/profiles/per-user when necessary (backport #12391)
 2025-02-20 16:45:41 +00:00
Eelco Dolstra
856afa27c2 Build the binary tarball 2025-02-20 17:22:42 +01:00
Sandro Jäckel
65583ca79b Only try to chmod /nix/var/nix/profiles/per-user when necessary 
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
(cherry picked from commit dcbf4dcc09)
 2025-02-20 16:11:27 +00:00
Robert Hensing
76f4119605
Merge pull request #12391 from SuperSandro2000/per-user-stat-chmod 
Only try to chmod /nix/var/nix/profiles/per-user when necessary
 2025-02-20 17:10:24 +01:00
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