diff options
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 5b1ae523800a..8c4871fb084a 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 8b4531e1bdb7..2736b63e8089 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-" |