nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-12 05:26:02 +01:00
Code Activity
19930 commits 179 branches 219 tags 169 MiB
Commit graph

128 commits

Author SHA1 Message Date
Eelco Dolstra
9d0c3dd6a7 Formatting 2025-03-24 22:02:49 +01:00
Eelco Dolstra
dab0ff4f9e Tagging release 2.27.1 
-----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCAAxFiEEtUHVUwEnDgvPFcpdgXC0cm1xmN4FAmfheacTHGVkb2xzdHJh
 QGdtYWlsLmNvbQAKCRCBcLRybXGY3kt2B/4tQvs6iDXA12d409ClHbVQjr1d0FLP
 rv8RxZ7Z4+Jaw8r2ra/I+gpr9juI5ULyEJWqfES72hTvbYPjH1Grsrrjak1tx57E
 +STs21oEPojE8LXsFH1oZamGPPIIpyQdxCvTgZs1N6cqUfCRQ3Jx97X6E6SIGJDR
 VqBM4ruSXCY57yT36HqwYydTkxzZHiNP5wwABGfSb7u9pYW5x3r8W7+fQ3udTnCw
 kCRhA5vnfxIQSlxu4j7dJqSCGzOIPnhYB19bXDV4aPhl4sn3pkBCdMZxPBlCWSwx
 it0ngMITf+TeiMpVl2TtvMBOHtlGrbhusbyKcsqzFYULGyGOC9ngTAY3
 =/JzB
 -----END PGP SIGNATURE-----

Merge tag '2.27.1' into detsys-main

Tagging release 2.27.1
 2025-03-24 21:28:03 +01:00
Kirens
53ac3c8ba9 make sure doc and manpage outputs are symlinks 
Part of https://github.com/NixOS/nixpkgs/pull/392549
The doc and manpage fix already happend in 0ddfbc5939

(cherry picked from commit 15dfeb9182)
 2025-03-24 13:10:27 +00:00
Sergei Zimmerman
c73f672afd packaging/everything.nix: Fix doc and man outputs 
We want the $doc, $man outputs to be symlinks pointing to nix-manual and
nix-manual.man. Creating the directories first makes the `ln` command
produce symlink $doc/${nix-manual} instead.

```
$file /nix/store/q4dwlnd36gpfajgfcp6hca2xwy068wjq-nix-2.27.1-man/rwh8ky3k040wyrywl8k2v5b3csdfbdg7-nix-manual-2.27.1-man

/nix/store/q4dwlnd36gpfajgfcp6hca2xwy068wjq-nix-2.27.1-man/rwh8ky3k040wyrywl8k2v5b3csdfbdg7-nix-manual-2.27.1-man:
  symbolic link to /nix/store/rwh8ky3k040wyrywl8k2v5b3csdfbdg7-nix-manual-2.27.1-man
```

This is the reason `nix-env --help` is once again broken on 2.26/2.27/master
after 4108529.

(cherry picked from commit 0ddfbc5939)
 2025-03-23 11:54:17 +00:00
Eelco Dolstra
25ba7c55d3 Merge remote-tracking branch 'origin/2.26-maintenance' into sync-with-2.26 2025-03-05 18:01:03 +01:00
Robert Hensing
afad1e536e packaging: Typo in setVersionLayer / preConfigure 
Apparently dead code in our use case, but good to keep nonetheless.
Credit: ztzg in https://github.com/NixOS/nix/pull/12498#pullrequestreview-2658031853

(cherry picked from commit dcaea8cb1c)
 2025-03-04 16:46:18 +00:00
Robert Hensing
87bf338612 packaging: Typo in setVersionLayer / preConfigure 
Apparently dead code in our use case, but good to keep nonetheless.
Credit: ztzg in https://github.com/NixOS/nix/pull/12498#pullrequestreview-2658031853

(cherry picked from commit dcaea8cb1c)
 2025-03-04 16:46:15 +00:00
Robert Hensing
7e7e9d9eab packaging/everything.nix: Use a multi-output derivation 
This should fix a few packaging regressions.

`dev` also includes a merged `includes/`, which may be helpful until
inter-component includes are fixed properly.

(cherry picked from commit 41085295ab)
 2025-03-02 13:09:49 +00:00
Robert Hensing
d8606f96ee packaging/everything.nix: Use a multi-output derivation 
This should fix a few packaging regressions.

`dev` also includes a merged `includes/`, which may be helpful until
inter-component includes are fixed properly.

(cherry picked from commit 41085295ab)
 2025-03-01 10:36:41 +00:00
Eelco Dolstra
94347f4622 nix -> determinate-nix 2025-02-24 23:28:09 +01:00
Eelco Dolstra
e71a498e25 Disable setVersionLayer 
This sets .version to finalAttrs.version, so we would end up with `nix
--version` showing `nix (Determinate Nix 0.37.2) 0.37.2`.
 2025-02-24 23:08:53 +01:00
Eelco Dolstra
5fc89adf6c Use Determinate version in store path name 2025-02-24 23:08:53 +01:00
Eelco Dolstra
6749d26dbb Merge remote-tracking branch 'origin/2.26-maintenance' into detsys-main 2025-02-24 22:41:22 +01:00
Robert Hensing
9e87a58314 packaging: Use correct stdenv for x86_64-darwin 
(cherry picked from commit 0772c2e3ab)
 2025-02-24 20:55:05 +00:00
Robert Hensing
0772c2e3ab packaging: Use correct stdenv for x86_64-darwin 2025-02-24 16:44:12 +01:00
John Ericson
6877988515 Fix dev shell 
There was one `inputs.nixFmt` left after 573ffac2e6.
 2025-02-20 13:01:42 -05: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
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
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
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
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
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
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
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
Robert Hensing
3556f6bf4c Write just ./.version on all components 
This way it's easier to get right. See previous commit.
 2025-02-18 11:41:35 +01:00
Robert Hensing
b0bbb1252a Support libgit2 1.9.0 
For when the overlay is used with nixos-unstable.
1.9.0 has our patches.
 2025-02-17 17:30:30 +01:00
Eelco Dolstra
d308228497 Don't import a symlink 
This is a workaround to avoid differing evaluation results between Nix
2.19 and >= 2.20 (#12449).

(cherry picked from commit 2e20a5f822)
 2025-02-12 11:42:49 +00:00
Eelco Dolstra
2e20a5f822 Don't import a symlink 
This is a workaround to avoid differing evaluation results between Nix
2.19 and >= 2.20 (#12449).
 2025-02-11 22:42:36 +01:00
Robert Hensing
605bd06ca4 packages.default: Add meta.mainProgram 
(cherry picked from commit 0d7418b4fe)
 2025-01-28 08:16:00 +00:00
Robert Hensing
0d7418b4fe packages.default: Add meta.mainProgram 2025-01-27 14:26:15 +01:00
Robert Hensing
32aed360b8 Format .nix files 
This does not include any automation for the release branch, but
is based on the configuration of https://github.com/NixOS/nix/pull/12349

    pre-commit run -a nixfmt-rfc-style
 2025-01-24 20:40:21 +01:00
Robert Hensing
96e550efc5 Format .nix files 
... with nixfmt (rfc style)
 2025-01-24 17:04:02 +01:00
Robert Hensing
ba6425a7d0 dev: Configure nixfmt (rfc style) 2025-01-24 17:02:50 +01:00
Robert Hensing
f168a6e739
Merge pull request #11799 from obsidiansystems/flake-nixpkgs-cleanup 
Clean up packaging a bit
 2025-01-22 22:40:24 +01:00
Eelco Dolstra
b09b4dc995 x86_64-darwin: Disable LTO 
LTO on x86_64-darwin appears to break the ability to catch exceptions
correctly (maybe just for exception types defined in different
libraries). This leads to many weird test failures,
e.g. https://hydra.nixos.org/build/286312387 and
https://hydra.nixos.org/build/286312341.
 2025-01-21 18:10:12 +01:00
Eelco Dolstra
a82c63f5d8 Fix nix-everything build 
https://hydra.nixos.org/build/286306734
 2025-01-21 09:54:57 +01:00
John Ericson
0fe92067fb Fixes for nix-everything wrapper 
1. Fix this eval error:
   https://hydra.nixos.org/jobset/nix/master#tabs-errors

   The dev package output (actually a separate derivation) needs to skip
   this for cross just as the main package output does.

2. Deduplicate libs attrset and list.

3. Move `nix-functional-tests` to `checkInputs`.

   With the Meson build system, we no longer need a `check` vs
   `install-check` distinction, so it is simpler to just keeep
   everything in one place.
 2025-01-20 12:19:21 -05:00
Robert Hensing
809f157a49 maint: Disable LTO for static due to build failure 2025-01-20 16:11:48 +01:00
Robert Hensing
0c85477f8e maint: Remove perl bindings from static build for now 2025-01-20 16:03:21 +01:00
Eelco Dolstra
d8636843b1 mingw: Don't do LTO 
This breaks the build with "symbol wrong type (4 vs 3)".

https://stackoverflow.com/questions/28267100/dll-linking-failed-with-lto-using-mingw-w64
 2025-01-20 14:52:50 +01:00