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

52 commits

Author SHA1 Message Date
Eelco Dolstra
852075ec9d Tagging release 2.28.0 
-----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCAAxFiEEtUHVUwEnDgvPFcpdgXC0cm1xmN4FAmfv9fITHGVkb2xzdHJh
 QGdtYWlsLmNvbQAKCRCBcLRybXGY3ohrCAC1Uw/JJr3yEPlJ/jLc9t9HqEKMY08W
 W6SEjpYJHYixMXmoonexkqojncNWBaiytRa+vBY7JQq0xTOOBwj42TM2ZzMF4GXi
 vO4Ox0hEsRa/v7tSmK6GFz1sNEKEUOHDNbilg4kzkkBHPEGPUGMwdWkT0akO576Q
 SQ6ERwPPLsHDI2YtAeAD8R4p07CraiyA34ljDPz3rChTAXRPVKWxJUt1enwEWYTr
 cKk45RcR4S8rP1BVwf3wsNsrHjqjbaY45kPAo8GD79hFH0zkyJarS3Kgv8qsWLra
 9ph0DVVG0wiArlET7Y3uchqtAC0Z5LOnutAmOFYFw6DKfWp9yGfl/SVW
 =XRda
 -----END PGP SIGNATURE-----

Merge tag '2.28.0' into sync-2.28.0

Tagging release 2.28.0
 2025-04-04 17:49:15 +02:00
Robert Hensing
abd5909fb6 packaging: Various improvements 
Co-authored-by: Mic92 <Mic92@users.noreply.github.com>
(cherry picked from commit 1172e49a3a)
 2025-04-01 17:50:33 +00:00
Eelco Dolstra
9d0c3dd6a7 Formatting 2025-03-24 22:02:49 +01: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
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
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
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
f0bdb65216
packaging: Remove dead code 
... from nixpkgs, my bad.
 2025-02-19 00:10:05 +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
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
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
4eecf3c20a Add nix-flake-c, nix_flake_init_global, nix_flake_settings_new 2024-11-24 23:57:24 +01:00
Eelco Dolstra
f29e7867a9 Revert "Merge pull request #11826 from DeterminateSystems/revert-11804" 
This reverts commit aeffdeffc8, reversing
changes made to 723fdeb4f1.
 2024-11-11 15:21:34 +01:00
Eelco Dolstra
67d231c046 Revert "Merge pull request #11804 from obsidiansystems/remove-old-make" 
This reverts commit 619eeb658a, reversing
changes made to 1af94bf471.
 2024-11-07 13:46:37 +01:00
John Ericson
e70c9bb06a Remove old build system 2024-11-06 16:09:18 -05:00
John Ericson
e65510da56 Move unit tests to the location Meson expects them to be 
Everything that is a separate subproject should live in the subprojects
directory.

Progress on #2503

This reverts commit 451f8a8c19.
 2024-10-17 15:42:16 -04:00
John Ericson
08b59aad31 Build the manual with Meson 
Co-Authored-By: Qyriad <qyriad@qyriad.me>
Co-Authored-By: Robert Hensing <robert@roberthensing.nl>
Co-Authored-By: eldritch horrors <pennae@lix.systems>
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
Co-authored-by: Tom Bereknyei <tomberek@gmail.com>
 2024-10-09 11:58:17 -04:00
John Ericson
b41cc1a755 Make wrapper derivation 
This ensures just `nix build`-ing the flake doesn't forget to run all
tests. One can still specifiy specific attributes to just build one
thing.

Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
 2024-08-14 18:04:38 -04:00
John Ericson
34fe2478a2 Build Functional tests with Meson 
Co-Authored-By: Qyriad <qyriad@qyriad.me>
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
 2024-08-14 15:35:40 -04:00
John Ericson
93f58150c9 Coarse versions for constituent packages 
As discussed in our meeting, we should use a simplified version for the
libraries without the date or commit hash. This will make rebuilding a
lot faster in many cases.

Progress on #10379

Co-Authored-By: Robert Hensing <robert@roberthensing.nl>
 2024-08-14 12:23:01 -04:00
John Ericson
0feeab755a Move plugins infra to libnixmain 
They are not actually part of the store layer, but instead part of the
Nix executable infra (libraries don't need plugins, executables do).

This is part of a larger project of moving all of our legacy settings
infra to libmain, and having the underlying libraries just have plain
configuration structs detached from any settings infra / UI layer.

Progress on #5638
 2024-07-15 17:26:03 -04:00
John Ericson
7a6269ba7b Package the Nix CLI with Meson 
Co-Authored-By: Qyriad <qyriad@qyriad.me>
 2024-07-08 17:49:44 -04:00
John Ericson
3acf3fc746 Package libnixmain and libnixcmd with Meson 
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
 2024-07-05 16:40:55 -04:00
John Ericson
451f8a8c19 Put back files for now 
We'll revert this sometime later
 2024-07-02 09:26:22 -04:00
John Ericson
496b4a9cd2 Move around unit test dirs to match new names 2024-07-02 09:26:22 -04:00
John Ericson
79e0ef88bf Include missing components 2024-07-02 09:26:22 -04:00
John Ericson
46ec69a483 Everything builds in the dev shell now 2024-07-02 09:26:22 -04:00
John Ericson
0b539dea4a Improve boost hacks 2024-07-02 09:26:22 -04:00
John Ericson
17a8c2bfce Unit tests and external libraries 2024-07-02 09:23:24 -04:00
John Ericson
31257009e1 Meson build for libexpr and libflake 2024-07-02 09:23:24 -04:00
Robert Hensing
985c211061 flake.nix: Move {in,ex}ternal-api-docs into nixComponents scope 2024-06-26 10:48:45 +02:00
Robert Hensing
c24dbf1457 components.nix: Simplify 2024-06-26 04:17:30 +02:00
Robert Hensing
25dc12aab1 components.nix: Extract dependency scope 
This avoids polluting nixComponents with things that aren't our
components.
Fixes the extraction of passthru tests, which failed for boehmgc
which had many irrelevant ones anyway.
 2024-06-26 04:11:20 +02:00
Robert Hensing
ebf77c79ae flake.nix: Use Nixpkgs convention for package variants 2024-06-26 04:11:20 +02:00
Robert Hensing
74b9b77c9f components.nix: Simplify with scope 2024-06-26 04:11:20 +02:00