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

chore(3p/overlays): Pin Nix to a 2.3 backport of nixpkgs/nix#3564

Browse source 
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 <sternenseemann@systemli.org>
This commit is contained in:
Vincent Ambo 2022-04-21 14:08:12 +02:00 committed by tazjin
parent 119462d720
commit 3cd1fb5283
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
third_party/overlays/tvl.nix vendored
View file

@ -2,10 +2,22 @@
# nixpkgs tree, where required. # nixpkgs tree, where required.
{ depot, ... }: { depot, ... }:
self: super: { self: super:
# Rollback Nix to a stable version (2.3) while there is lots of let
# random ecosystem breakage with the newer versions. # Rollback Nix to a stable version (2.3) with backports for
nix = super.nix_2_3; # 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 { clang-tools_11 = self.clang-tools.override {
llvmPackages = self.llvmPackages_11; llvmPackages = self.llvmPackages_11;