wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-17 18:38:28 +02:00
Code Activity
19224 commits 246 branches 207 tags 171 MiB
Commit graph

93 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Robert Hensing
605bd06ca4 packages.default: Add meta.mainProgram 
(cherry picked from commit 0d7418b4fe)
 2025-01-28 08:16:00 +00: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
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
Robert Hensing
cab347b4eb refactor: Move ld=gold rule to mesonBuildLayer 2025-01-15 20:01:00 +01:00
Connor Baker
359a0840e2 packaging: use optimization level 3 and LTO by default 2025-01-01 21:59:37 -08:00
Jörg Thalheim
b5ad051b6c remove upstreamed toml11 package override 2024-12-16 16:50:59 +01:00
Jörg Thalheim
81b6b79a56 remove upstreamed libseccomp 2024-12-16 16:50:58 +01:00
Jörg Thalheim
1a8bd84f55 remove upstreamed busybox-sandbox-shell 2024-12-16 16:50:58 +01:00
Jörg Thalheim
9131905185 use libgit2 from nixpkgs 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
62d3957268 Remove dead code from nix-daemon-compat-tests packaging 
We're not testing against these versions anymore.
If we bring that back (I would support that), we could do so in a clean
way, by making sure that the packaging we test against has a proper version
attribute.
 2024-12-09 17:35:57 +01:00
Robert Hensing
6d86839a02 Use version correctly in nix-daemon-compat-tests derivation 
Previously, a version would be appended to the pname which already
contained a version.
 2024-12-09 17:34:56 +01:00
Robert Hensing
1edf868213 rename: nix-tests -> nix-daemon-compat-tests 
I think I have failed to read the very long version-garbage-like
string for the second time now, leaving me oblivious to the crucial
info that a test failure happens in the context of an older daemon.
 2024-12-09 16:49: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
Robert Hensing
d65fac0fc4 Add --print-errorlogs to mesonCheckFlags 
This prints the error logs in the tests, including when they're run
with `checkPhase` in the dev shell.
 2024-11-18 15:08:32 +01:00
John Ericson
03dc3c5769
Merge pull request #11869 from NixOS/unbloat-nix-everything 
nix-everything: Remove libs, add dev and devdoc package outputs
 2024-11-13 16:15:14 -05:00
Eelco Dolstra
e6aae64318 Make the default stdenv phases do the right thing 
Fixes #11858.
 2024-11-12 20:42:53 +01:00
Robert Hensing
f312a7cfff nix-everything: Make doc a separate package output 2024-11-12 20:11:50 +01:00
Robert Hensing
d4cec7511d nix-everything: Remove libs, add dev and devdoc package outputs 
The new package output attributes are somewhat experimental, and
provided for compatibility most of all.

We'll see how well this goes before the changes proposed in
https://github.com/NixOS/nix/issues/6507
 2024-11-12 20:05:48 +01:00
Eelco Dolstra
06769eb2bf nix-everything: Pass through a version attribute 
The existence of this attribute is assumed by the Determinate
Installer packaging and maybe others.
 2024-11-12 16:42:59 +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
d5f5717172 Remove shellInputs.i686-linux 
It fails to compile (https://hydra.nixos.org/build/277363696) and it's
unlikely anybody cares.
 2024-11-08 13:14:43 +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
71c2e21f3b Temporarily skip coverage checks 2024-11-06 16:09:18 -05:00
John Ericson
ba34ea9fe7 Add missing deps to the dev shell 2024-11-06 16:09:18 -05:00
John Ericson
26ea905312 Include more deps for the dev shell 
When we get rid of the make build system, we would be missing things.
Incuding these packages' deps ensure we don't miss things.
 2024-11-04 15:48:08 -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
42b5421d5a hydraJobs.build{NoGc,ReadlineNoMarkdown} build using Meson 
Getting ready for the complete switch-over

Progress on #2503
 2024-11-04 13:53:23 -05:00
John Ericson
62ef9fa03c
Remove redundant pkgs.pkgs 
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
 2024-11-04 13:07:26 -05:00
John Ericson
142f55457b Test against tests using Meson-built Nix 2024-11-04 12:17:44 -05:00