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
Ivan Trubach
eb73bfcf73
libstore: fix expected bytes in progress bar
2025-02-18 22:09:05 +03: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
Robert Hensing
d47e3c9576
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.
2025-02-18 19:06:36 +01:00
Robert Hensing
0dbe28ad9d
packaging: Add patch count to version
2025-02-18 19:04:53 +01:00
Robert Hensing
03efba30da
test: Ignore packaging-overriding check on darwin for now
2025-02-18 19:04:03 +01:00
Robert Hensing
48fb6fdde9
packaging: Add source overriding "methods"
2025-02-18 19:03:29 +01:00
Robert Hensing
f31d86284f
packaging: Add overrideAllMesonComponents
2025-02-18 18:57:02 +01:00
Robert Hensing
cca01407a7
packaging: Move layers from dependencies to components
...
This makes it easier to implement batch overriding for the components.
2025-02-18 18:57:02 +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
373581203411c42cb2e1
2025-02-18 16:39:48 +00:00
John Ericson
5facd492ad
Merge pull request #12499 from DeterminateSystems/detect-daemon-crash
...
startDaemon(): Detect if the daemon crashes before creating the socket
2025-02-18 11:38:16 -05:00
John Ericson
da5109835b
Merge pull request #12498 from NixOS/fix-cli-fine-version
...
Restore detailed Nix CLI version
2025-02-18 11:34:07 -05:00
