wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-24 22:11:15 +02:00
Code Activity
20265 commits 244 branches 205 tags 158 MiB
Commit graph

421 commits

Author SHA1 Message Date
Pol Dellaiera
5862f38d00 docker: use callPackage, parametrise the image build 2025-06-12 19:50:31 +02:00
John Ericson
81f5d6763d
Merge pull request #13299 from xokdvium/restore-packaging-overriding 
flake: Restore `packaging-overriding` check
 2025-05-29 22:31:15 -04:00
Sergei Zimmerman
4fa991a680
flake: Restore packaging-overriding check 
The underlying bug seems to have been fixed in diffoscope 293 [1] [2].
Our nixpkgs input has 295.

[1]: https://github.com/NixOS/nixpkgs/pull/393381#issuecomment-2766703347
[2]: https://diffoscope.org/news/diffoscope-292-released/
 2025-05-29 22:35:50 +00:00
Sergei Zimmerman
dd80f16376
flake: Drop pre-commit override 
`pre-commit` builds fine with the flake's input nixpkgs
on i686-linux.
 2025-05-29 21:57:08 +00:00
John Ericson
ef36806898
Explain the use of "2" in the overlay 
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
 2025-04-20 17:20:54 -04:00
Robert Hensing
b257ea94e3 Fix pkgs.nixVersions and installTests 
... by moving our stuff out of the way from upstream's
`nixComponents` and `nixDependencies` attrsets.

(I prefer not to use overlays, but let's make it work this way
first)
 2025-04-20 22:20:52 +02:00
Robert Hensing
e76bbe413e
Merge pull request #12877 from roberth/c-api-libflake-override-input 
C API: Flake loading, input overriding
 2025-04-08 09:01:51 +02:00
Robert Hensing
5c4a4aeed7 Revert "remove obsolete stdenv darwinMinVersion override" 
This reverts commit d91310bb32.

> Some packages require setting a non-default deployment target
> (or minimum version) to gain access to certain APIs. You do
> that using the darwinMinVersionHook, which takes the deployment
> target version as a parameter.

-- 60b54c7aee/doc/stdenv/platform-notes.chapter.md (what-is-a-deployment-target-or-minimum-version-sec-darwin-troubleshooting-using-deployment-targets)

This will again solve error:

    ../nix_api_expr.cc:38:18: error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer

-- https://hydra.nixos.org/build/294088946
 2025-04-03 23:22:19 +02:00
Robert Hensing
33e638dc1d
Merge pull request #12863 from Mic92/libgit2 
libgit2: use upstream version if possible
 2025-04-02 22:44:42 +02:00
Eelco Dolstra
93d8f62057 Remove meta.maintainers 
Some of the maintainer attribute names got changed in nixos-unstable
(e.g. "edolstra" is now "eelco") but we want this flake to work on
nixos-24.11. So just get rid of them.
 2025-04-02 22:02:15 +02:00
Eelco Dolstra
7eb76186ba Update meta.maintainers field for nixos-unstable 2025-04-02 21:39:02 +02:00
Robert Hensing
60bffbd41b nix-fetchers-c: Init with settings object 
Also make it a dependency of nix-flake-c; we'll need that.
 2025-04-02 18:29:42 +02:00
Robert Hensing
1061a0965a nix-flake-c: Add missing bits 2025-04-02 18:02:32 +02:00
Jörg Thalheim
d91310bb32 remove obsolete stdenv darwinMinVersion override 
we are more up-to-date now:

nix-repl> stdenv.hostPlatform.darwinMinVersion
"11.3"
 2025-04-01 19:20:43 +02:00
Robert Hensing
1172e49a3a packaging: Various improvements 
Co-authored-by: Mic92 <Mic92@users.noreply.github.com>
 2025-04-01 18:51:09 +02:00
Robert Hensing
c212035d94 flake: nixpkgs: 24.11 -> nixos-unstable 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/48d12d5e70ee91fe8481378e540433a7303dbf6a?narHash=sha256-1Noao/H%2BN8nFB4Beoy8fgwrcOQLVm9o4zKW1ODaqK9E%3D' (2024-12-16)
  → 'github:NixOS/nixpkgs/52faf482a3889b7619003c0daec593a1912fddc1?narHash=sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om%2BD4UnDhlDW9BE%3D' (2025-03-30)
 2025-04-01 15:19:54 +02:00
Eelco Dolstra
a4be66828a Disable packaging-overriding 
Fixes #12690.
 2025-03-31 16:37:36 +02:00
Sergei Zimmerman
874587516c flake: Enable UBSAN for checks 
Doing this makes catching non-obvious bugs easier. GHA CI workload is
already a concern and there isn't much benefit in running the tests with
and without sanitizers at the same time, so UBSAN is enabled for default
checks.

This change doesn't affect production builds in any way, but is rather a
step in the direction of improving automated testing during development.

Relates to #10969.
 2025-03-09 00:24:47 +03: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
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
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
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
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
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