mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(third_party/nixpkgs/nix_2_3): switch to 2.3-maintenance

Browse source 
The comment about what fixes have been applied was outdated (more was
cherry-picked), and all our backports have been upstreamed to the 2.3-
maintenance branch.

Switch to there, which will also give us support for zstd, which was
merged separately.

Fixes https://b.tvl.fyi/issues/328

Change-Id: Ice25ebaaf8250a97f032a40a4dd0c7fad2ebda28
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9906
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
This commit is contained in:
Florian Klink 2023-11-03 10:20:15 +02:00 committed by clbot
parent fd725bc7fd
commit c017e6d51a
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
third_party/overlays/tvl.nix vendored
View file

@ -4,19 +4,20 @@
self: super: self: super:
let let
# Rollback Nix to a stable version (2.3) with backports for # Rollback Nix to a stable version (2.3) with some backports applied.
# build-user problems applied. # We currently track a commit on the 2.3-maintenance that didn't make it into
# a release yet - tracked in https://github.com/NixOS/nix/issues/9244.
nixSrc = nixSrc =
let let
# branch 2.3-backport-await-users # branch 2.3-maintenance
rev = "46a91f2abaee85135cbb447c13957d3c5e9091a9"; rev = "f76990444c17716506080e5445e430a9c5c880f9";
in in
self.fetchFromGitHub self.fetchFromGitHub
{ {
owner = "tvlfyi"; owner = "NixOS";
repo = "nix"; repo = "nix";
inherit rev; inherit rev;
hash = "sha256:0rwyrh471c5y64axyd8vzzzmzlscg97fsrjbgbm1a93wnzxcvnvk"; hash = "sha256-EK0pgHDekJFqr0oMj+8ANIjq96WPjICe2s0m4xkUdH4=";
} // { revCount = 0; shortRev = builtins.substring 0 7 rev; }; } // { revCount = 0; shortRev = builtins.substring 0 7 rev; };
nixTarball = (scopedImport nixTarball = (scopedImport