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

424 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
Eelco Dolstra
494953cfb6 Mark official release 2025-02-27 17:03:27 +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
Cole Helbling
a4e9b65c3a fixup: remove unsafeDiscardStringContext? 2025-02-21 13:51:25 -08:00
Cole Helbling
90581c9d66 Setup uploading PRs, tags, and branches to IDS 2025-02-21 13:01:26 -08: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
573ffac2e6 Remove nixfmt override 
Closes https://github.com/NixOS/nix/issues/12418
IFD in nixfmt repo
 2025-02-19 10:29:58 +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
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
Eelco Dolstra
6c61d0ab8c Formatting 2025-02-19 00:26:06 +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
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
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
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
Eelco Dolstra
28752fe288 Mark official release 2025-01-22 12:16:44 +01:00
John Ericson
69fde530a6 Clean up packaging a bit 
- Multiple choices of stdenv are handled more consistently, especially for the dev
  shells which were previously not done correctly.

- Some stray nix code was moving into the `packaging` directory
 2025-01-17 15:09:43 -05:00
Tristan Ross
47cf93ba80
Add LLVM to Flake 2025-01-10 18:08:27 -08:00
Robert Hensing
3859b3b9e1
Merge pull request #11566 from Mic92/nixpkgs-upgrade 
Nixpkgs upgrade to NixOS 24.11
 2024-12-31 15:37:44 +01:00
Jörg Thalheim
5cd5391dd8 checks: re-enable perlBindings 2024-12-17 21:10:34 +00:00
Jörg Thalheim
cf0ba0d20e netbsd: disable cross-compilation 
Cross-compilation of curl is broken in nixpkgs. Therefore we disable it
until nixpkgs fixes the underlying issues.
 2024-12-16 16:50:59 +01:00
Jörg Thalheim
9131905185 use libgit2 from nixpkgs 2024-12-16 16:50:58 +01:00
Jörg Thalheim
cd002ae6dd flake.nix: switch to nixpkgs 24.11 2024-12-16 16:50:58 +01:00
Jörg Thalheim
6162e1220e installer: make sure we can always test the installer in ci and locally 
Just now there is a dependency on cachix, which means we cannot test
the installer in CI if forks do not have the necessary secrets set up.
We replace this with a simple http server that serves the installer and
can be both used in CI and locally.
 2024-12-15 18:17:15 +01:00
Robert Hensing
747cf4e50f fix: Add splicing to fix the manual in cross 
We *could* use a "native" manual instead - ie reusing a native
`nixpkgsFor.${buildPlatform}`, but this works, and also
works for possible cases where we have a custom or patched build tool.
 2024-12-02 15:55:18 +01:00
Eelco Dolstra
000d06d85b Provide a "nix" package 2024-11-12 16:42:43 +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
c49a0ae8b8
Slightly tweak flake.nix 
`lib.concatMapAttrs` instead of `lib.mapAttrs'` and `lib.nameValuePair`

Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
 2024-11-05 23:22:43 -05:00
John Ericson
9e1bc9c224 Make the choice of stdenv for the dev shell properly affect all deps 
We have per-stdenv package sets, so we should be using them.
 2024-11-04 15:47:54 -05:00
John Ericson
39fd4705ac Factor out the dev shell 
It had gotten rather big. Hopefully we'll eventually have some generic
infra for a "multi-package dev shell" and not need so much code for
this, but until then it's better in a separate file.
 2024-11-04 15:14:20 -05:00
Eelco Dolstra
f36f4a4f52 Disable some Hydra jobs that we don't care about at the moment 2024-10-30 13:30:39 +01:00
Eelco Dolstra
21ddd181fe Disable mingw32 jobs 
This gets rid of an evaluation error in
devShells.aarch64-linux.x86_64-w64-mingw32.

3222692304
 2024-10-30 12:53:05 +01:00
Eelco Dolstra
ffcc42faf4 Revert flake-schemas for now 2024-10-29 15:18:48 +01: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
57a478572d Rename baseNativeBuildInputs 
as requested

Co-Authored-By: Robert Hensing <robert@roberthensing.nl>
 2024-10-09 11:07:12 -04:00
Jörg Thalheim
2b7642632e devShell: increase priority of clang-tools 
Before we would get the unwrapped version of clang-tools from clang
itself, which doesn't quite work.
 2024-09-18 14:29:26 +02:00
John Ericson
c7ec33605e Meson misc things 
Meson-ify a few things, scripts, completions, etc. Should make our Meson
build complete except for docs.

Co-Authored-By: Qyriad <qyriad@qyriad.me>
Co-Authored-By: eldritch horrors <pennae@lix.systems>
 2024-08-27 10:19:55 -04:00
Eelco Dolstra
3af73bae5c Remove checks for nixComponents 
We are currently building Nix twice in the main GHA CI job, which is
frequently timing out. Obviously, we want this to be fast, so only do
the main build for now.
 2024-08-22 13:48:46 +02:00
Eelco Dolstra
528e490418 Disable the static build in CI 
GHA builds are now frequently timing out, so let's not do this. If
wanted, it could be done in a separate job.
 2024-08-22 13:47:33 +02: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