From 255750471b2830668352f5815932d86aec8994bb Mon Sep 17 00:00:00 2001 From: sterni Date: Sat, 2 Jul 2022 11:18:50 +0200 Subject: chore(3p/overlays): bump Nix fork This includes a small fix relating to string configureFlags being deprecated, silencing a warning during eval. Change-Id: I9528a5554dbc56d4d3f2a60edcb7de338ca6adc0 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5911 Tested-by: BuildkiteCI Autosubmit: sterni Reviewed-by: tazjin --- third_party/overlays/tvl.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'third_party/overlays/tvl.nix') diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index 59c9ecf643..9bb88dc2be 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -6,14 +6,18 @@ self: super: let # Rollback Nix to a stable version (2.3) with backports for # build-user problems applied. - nixSrc = self.fetchFromGitHub - { - owner = "tvlfyi"; - repo = "nix"; + nixSrc = + let # branch 2.3-backport-await-users - rev = "880a62b08443a6baa55dab027b69bb8b1551a588"; - hash = "sha256:0jnwrzxh04d0pyhx4n8fg4w1w6ak48byl5k2i8j7fk4h9vd9649k"; - } // { revCount = 0; shortRev = "880a62b0"; }; + rev = "4510dbc8a6802902cbab6444134659548fffb9b0"; + in + self.fetchFromGitHub + { + owner = "tvlfyi"; + repo = "nix"; + inherit rev; + hash = "sha256:0vg2xzwc8q1sw20b26qbyd4flnws8668yhi1cg2h6z3jb3wamhr5"; + } // { revCount = 0; shortRev = builtins.substring 0 7 rev; }; in { nix = (import "${nixSrc}/release.nix" { -- cgit 1.4.1