maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(3p/overlays): build Nix 2.3 from TVL maintenance branch

Browse source 
Our maintenance branch includes additional concurrency fixes which are not in
the upstream 2.3 branch.

These issues are fixed in C++ Nix HEAD, but in a more invasive way (by removing
the second set of locks completely).

This also retains additional debug information in the built binaries to make
future issues easier to debug.

Change-Id: I4e7a8baabd059c96404822d9634df52c403a869f
Reviewed-on: https://cl.tvl.fyi/c/depot/+/13135
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
This commit is contained in:
Vincent Ambo 2025-02-15 10:02:21 +03:00 • committed by tazjin
parent 2a36d422ce
commit f3ca96eccc
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
third_party/overlays/tvl.nix vendored
View file

@ -7,7 +7,18 @@ depot.nix.readTree.drvTargets {
nix_2_3 = (super.nix_2_3.override {
# flaky tests, long painful build, see https://github.com/NixOS/nixpkgs/pull/266443
withAWS = false;
}).overrideAttrs (_: {
# use TVL maintenance branch for 2.3, which has more fixes than upstream
CXXFLAGS = "--std=c++20 -g";
dontStrip = true;
src = self.fetchFromGitHub {
owner = "tvlfyi";
repo = "nix";
rev = "d516e2826128c09588535b67aa27fd3e24288b5f";
sha256 = "04yxxhhq4542gakfh2kylnhq9fagfzv63shrq0qvf8rajflwxr22";
};
});
nix = self.nix_2_3 // {
# avoid duplicate pipeline step
meta = self.nix_2_3.meta or { } // {
@ -16,6 +27,7 @@ depot.nix.readTree.drvTargets {
};
};
};
nix_latest_stable = super.nix.override ({
# flaky tests, long painful build, see https://github.com/NixOS/nixpkgs/pull/266443
withAWS = false;