wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-30 19:57:59 +02:00
Code Activity
19452 commits 245 branches 205 tags 160 MiB
Commit graph

19452 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eelco Dolstra
dece94fe25 Restrict permissions 2025-02-21 02:12:41 +01:00
Eelco Dolstra
53c03a0161 Cleanup 2025-02-21 01:50:42 +01:00
Eelco Dolstra
c23a2cdc4a Hack 2025-02-21 01:43:22 +01:00
Graham Christensen
90e355784c
Merge pull request #51 from DeterminateSystems/graham/fh-634-spaghetti-deploy 
Initial cut of propose-release / release workflows
 2025-02-21 00:40:47 +00:00
Eelco Dolstra
0dc5b249ff Build the Nix manual in CI and deploy to Netlify 2025-02-21 00:23:30 +01:00
Graham Christensen
592994d2e1 Fixup the release workflow 2025-02-20 17:15:51 -05:00
Graham Christensen
013c09948e Create an initial propose-release workflow 2025-02-20 17:13:19 -05: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
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
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
Eelco Dolstra
a691dcf48f Run all of hydraJobs.tests.* 2025-02-20 16:08:07 +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
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
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
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
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
Eelco Dolstra
4055239936 Tagging release 2.26.2 
-----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCAAxFiEEtUHVUwEnDgvPFcpdgXC0cm1xmN4FAmetA5oTHGVkb2xzdHJh
 QGdtYWlsLmNvbQAKCRCBcLRybXGY3g2pB/9JAFyjmaXuccbMTO/6x9qwsWuuXNLk
 OQWzfbdUekvsihZZSFZg1r7KqqXHCi64f0nxLPsJ/0oeDWZktJ5KnbV630nuUlDj
 ulLCpKdvhWFa8dVx9LiziGwQw4KLx8PjOfwThtQ4DqCWxWEmu6lKkijag9cE+ai4
 3mw9YtUjBRxlXyhYLzWz3whLbv37c/m+R8iGS8xm8W260pmei6D0beOIPdfXYBQF
 PzPlPORyI08A06uqyA3z7bTxzmSMnzvu0QInCPCKSHzFUnTZPHUYuYStFl28NrZS
 fXKK59L0G7QEfdTRAmqQkdHdtPj2RlYFiMN0kQiNLflvKfGGWdi/kvdx
 =rRix
 -----END PGP SIGNATURE-----

Merge tag '2.26.2' into sync-2.26.2

Tagging release 2.26.2
 2025-02-18 19:57:51 +01:00
John Ericson
e310c19a1a
Merge pull request #12509 from NixOS/mergify/bp/2.26-maintenance/pr-12499 
startDaemon(): Detect if the daemon crashes before creating the socket (backport #12499)
 2025-02-18 12:23:20 -05:00
John Ericson
6c15761b0e
Merge pull request #12505 from NixOS/mergify/bp/2.26-maintenance/pr-12497 
Don't override default man search paths (backport #12497)
 2025-02-18 12:17:08 -05:00
Eelco Dolstra
f02a7b880e startDaemon(): Detect if the daemon crashes before creating the socket 
This avoids timeouts like those seen in
3735812034.

(cherry picked from commit 11c42cb2e1)
 2025-02-18 16:39:48 +00:00
Sergei Zimmerman
a004c84e85 Don't override default man search paths 
By appending a colon to MANPATH NIX_MAN_DIR gets prepended to the
final MANPATH before default search paths.
This makes man still consider default search paths, but prefers
NIX_MAN_DIR (if it exists).

It still makes sense to point NIX_MAN_DIR to a correct location
by moving man pages build from nix-manual.man to nix-cli.man, but
this should fix most common use-cases where nix is installed globally.

(cherry picked from commit 95f16a3275)
 2025-02-18 16:32:42 +00:00
Eelco Dolstra
adc0f67130
Merge pull request #12502 from NixOS/mergify/bp/2.26-maintenance/pr-12492 
Move code related to NIX_MAN_DIR from libstore to nix-cli (backport #12492)
 2025-02-18 15:56:35 +01:00
Sergei Zimmerman
80db87bd4c Move code related to NIX_MAN_DIR from libstore to nix-cli 
This is a prerequisite to properly fixing man-pages once and
for all [1]. Note that this patch leaves manpages for legacy
commands in a borked state, pending the movement of manpages from
nix-manual to nix-cli [2].

[1]: https://www.github.com/NixOS/nix/issues/12382
[2]: https://www.github.com/NixOS/nix/issues/12382#issuecomment-2663782043

(cherry picked from commit b1a38b3efe)
 2025-02-18 14:37:28 +00:00