From 23a5d730f7852bdff21acfadd2d4f9d1aa4c4081 Mon Sep 17 00:00:00 2001 From: sterni Date: Wed, 18 Jan 2023 19:39:28 +0100 Subject: chore(3p/sources): Bump channels & overlays * //3p/overlays/haskell: clean up stale override * //3p/overlays/tvl: work around mullvad build failure * //3p/gerrit: update dependencies' output hash Change-Id: Iaea849fb199bb3d059e067c237ca939b3558a766 Reviewed-on: https://cl.tvl.fyi/c/depot/+/7867 Tested-by: BuildkiteCI Reviewed-by: tazjin Autosubmit: sterni --- third_party/overlays/haskell/default.nix | 4 ---- third_party/overlays/tvl.nix | 8 ++++++++ 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'third_party/overlays') diff --git a/third_party/overlays/haskell/default.nix b/third_party/overlays/haskell/default.nix index 5b1ae52380..8c4871fb08 100644 --- a/third_party/overlays/haskell/default.nix +++ b/third_party/overlays/haskell/default.nix @@ -42,10 +42,6 @@ in # TODO(grfn): port to brick 1.4 (EventM gains an additional type argument in 1.0) brick = hsSelf.callPackage ./extra-pkgs/brick-0.73.nix { }; - - # TODO(sterni): upstream into nixpkgs - binary-orphans = - haskellLib.addBuildDepends [ hsSelf.OneTuple ] hsSuper.binary-orphans; }; }; }; diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index 8b4531e1bd..2736b63e80 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -45,6 +45,14 @@ depot.nix.readTree.drvTargets { ]; }); + # Apply workaround from https://github.com/NixOS/nixpkgs/pull/211469 + # until it hits the nixos-unstable channel + mullvad = super.mullvad.overrideAttrs (old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ + self.buildPackages.git + ]; + }); + home-manager = super.home-manager.overrideAttrs (_: { src = depot.third_party.sources.home-manager; version = "git-" -- cgit 1.4.1