From 3cd1fb52836b48ffe8d09225c6a2d5978871dd69 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Thu, 21 Apr 2022 14:08:12 +0200 Subject: chore(3p/overlays): Pin Nix to a 2.3 backport of nixpkgs/nix#3564 This PR fixed issues with build user management by waiting for in-use build users to become available instead of failing the build: https://github.com/NixOS/nix/pull/3564 I backported it to 2.3 in the Github repository this commit points to. Change-Id: Id22ba202c675a20203bdbcdc776c1c2ee7c0fc68 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5488 Tested-by: BuildkiteCI Reviewed-by: sterni --- third_party/overlays/tvl.nix | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index caf0998a0a19..9dee001ba801 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -2,10 +2,22 @@ # nixpkgs tree, where required. { depot, ... }: -self: super: { - # Rollback Nix to a stable version (2.3) while there is lots of - # random ecosystem breakage with the newer versions. - nix = super.nix_2_3; +self: super: +let + # Rollback Nix to a stable version (2.3) with backports for + # build-user problems applied. + nixSrc = builtins.fetchGit { + url = "https://github.com/tvlfyi/nix.git"; + ref = "2.3-backport-await-users"; + #hash = "sha256:0jnwrzxh04d0pyhx4n8fg4w1w6ak48byl5k2i8j7fk4h9vd9649k"; + }; +in +{ + nix = (import "${nixSrc}/release.nix" { + nix = nixSrc; + nixpkgs = super.path; + systems = [ builtins.currentSystem ]; + }).build."${builtins.currentSystem}"; clang-tools_11 = self.clang-tools.override { llvmPackages = self.llvmPackages_11; -- cgit 1.4.1