diff options
| author | Vincent Ambo <mail@tazj.in> | 2020-08-26T22·56+0100 |
|---|---|---|
| committer | tazjin <mail@tazj.in> | 2020-08-26T23·49+0000 |
| commit | eb3c4a3c1198e2bc4af80b9a1970e00ae901e436 (patch) | |
| tree | 3d81d6dcec47f6372e7c97ecabc6c054acc9b170 /third_party | |
| parent | 7e6b3e1b428bd5ea860c05d0c5a71cd1ecd23364 (diff) | |
fix(3p/haskell_overlay): Fix imports and remove unused file r/1722
Change-Id: I1973bc1b11442dc8150c3b07bd06a6f94c4c4380 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1851 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: kanepyork <rikingcoding@gmail.com>
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/haskell-overlay.nix | 49 | ||||
| -rw-r--r-- | third_party/haskell_overlay/default.nix | 2 |
2 files changed, 1 insertions, 50 deletions
diff --git a/third_party/haskell-overlay.nix b/third_party/haskell-overlay.nix deleted file mode 100644 index 86a3514982..0000000000 --- a/third_party/haskell-overlay.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ pkgs ? import ./nixpkgs.nix {} }: -self: super: with pkgs.haskell.lib; rec { - generic-arbitrary = appendPatch - super.generic-arbitrary - [ ./build/generic-arbitrary-export-garbitrary.patch ]; - - hgeometry = - appendPatch - (self.callHackageDirect { - pkg = "hgeometry"; - ver = "0.9.0.0"; - sha256 = "02hyvbqm57lr47w90vdgl71cfbd6lvwpqdid9fcnmxkdjbq4kv6b"; - } {}) [ ./build/hgeometry-fix-haddock.patch ]; - - hgeometry-combinatorial = - self.callHackageDirect { - pkg = "hgeometry-combinatorial"; - ver = "0.9.0.0"; - sha256 = "12k41wd9fd1y3jd5djwcpwg2s1cva87wh14i0m1yn49zax9wl740"; - } {}; - - vinyl = overrideSrc (markUnbroken super.vinyl) - rec { - src = pkgs.fetchzip { - url = "mirror://hackage/vinyl-${version}/vinyl-${version}.tar.gz"; - sha256 = "190ffrmm76fh8fi9afkcda2vldf89y7dxj10434h28mbpq55kgsx"; - }; - version = "0.12.0"; - }; - - comonad-extras = appendPatch (markUnbroken super.comonad-extras) - [ ./build/update-comonad-extras.patch ]; - - ghc-prof-flamegraph = overrideCabal super.ghc-prof-flamegraph (oldAttrs: rec { - version = "0.2.0.0"; - - src = pkgs.fetchFromGitHub { - owner = "fpco"; - repo = "ghc-prof-flamegraph"; - rev = "8edd3b4806adeb25a4d55bed51c3afcc8e7a8e14"; - sha256 = "1i05pw495y5n24s1313iip8njn1lkf22a89izvi19iw7qkx062hr"; - fetchSubmodules = true; - }; - - libraryHaskellDepends = oldAttrs.libraryHaskellDepends ++ [ - self.optparse-applicative - ]; - }); -} diff --git a/third_party/haskell_overlay/default.nix b/third_party/haskell_overlay/default.nix index ab0d175a61..b996cd48c4 100644 --- a/third_party/haskell_overlay/default.nix +++ b/third_party/haskell_overlay/default.nix @@ -1,4 +1,4 @@ -{ pkgs ? import ./nixpkgs.nix {} }: +{ pkgs ? import ./nixpkgs.nix {}, ... }: self: super: with pkgs.haskell.lib; rec { aeson = doJailbreak super.aeson; |