From b2cfe1ce644b1814e387b75c277879803bab8c05 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge Date: Mon, 12 Mar 2018 02:23:56 +0300 Subject: [PATCH] ghc841: cabal-install fixed upstream --- .../haskell-modules/configuration-ghc-8.4.x.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index d4c884a5f61..b727657f42b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -212,6 +212,22 @@ self: super: { hpack = self.hpack; }; + ## Upstreamed, awaiting a Hackage release + cabal-install = overrideCabal super.cabal-install (drv: { + ## Setup: Encountered missing dependencies: + ## Cabal >=2.0.1.0 && <2.1, base >=4.5 && <4.11 + src = pkgs.fetchFromGitHub { + owner = "haskell"; + repo = "cabal"; + rev = "728ad1a1e066da453ae13ee479629c00d8c2f32d"; + sha256 = "0943xpva0fjlx8fanqvb6bg7myim2pki7q8hz3q0ijnf73bgzf7p"; + }; + prePatch = "cd cabal-install; "; + ## Setup: Encountered missing dependencies: + ## network >=2.4 && <2.6, resolv >=0.1.1 && <0.2 + libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ network resolv ]); + }); + haskell-gi = overrideCabal super.haskell-gi (drv: { ## Setup: Encountered missing dependencies: ## haskell-gi-base ==0.20.*