diff options
| author | sterni <sternenseemann@systemli.org> | 2023-01-18T18·39+0100 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-01-20T22·31+0000 |
| commit | 23a5d730f7852bdff21acfadd2d4f9d1aa4c4081 (patch) | |
| tree | 9c29aab638be95df8b0eb5c624009544644d2f54 /third_party/overlays | |
| parent | bfa662eadf4bcc9419abe68631dc6a105c3b6f52 (diff) | |
chore(3p/sources): Bump channels & overlays r/5713
* //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 <tazjin@tvl.su> Autosubmit: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'third_party/overlays')
| -rw-r--r-- | third_party/overlays/haskell/default.nix | 4 | ||||
| -rw-r--r-- | third_party/overlays/tvl.nix | 8 |
2 files changed, 8 insertions, 4 deletions
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-" |