diff --git a/pkgs/development/tools/haskell/cabal-dev/default.nix b/pkgs/development/tools/haskell/cabal-dev/default.nix index 79385bd88a96..df7f728c752d 100644 --- a/pkgs/development/tools/haskell/cabal-dev/default.nix +++ b/pkgs/development/tools/haskell/cabal-dev/default.nix @@ -1,15 +1,19 @@ -{ cabal, Cabal, cabalInstall, filepath, HTTP, mtl, network, tar -, transformers, zlib +{ cabal, fetchurl, Cabal, cabalInstall, filepath, HTTP, mtl, network, tar +, transformers, zlib, setenv }: cabal.mkDerivation (self: { pname = "cabal-dev"; - version = "0.9.1"; - sha256 = "1brz0nw959jdyjrhjqy9sixsb316hjmw4pxxsybfl8vixsivdfh6"; + version = "0.9.1-git"; + src = fetchurl { + url = "https://github.com/creswick/cabal-dev/archive/54e7d93d5b309c56192c146c7a807ac3591bc464.tar.gz"; + sha256 = "1isi02jik0vrg48l7r2mj4cf9ms6hpxxz1mmhl7s3kkxx775cxj9"; + name = "${self.name}.tar.gz"; + }; isLibrary = false; isExecutable = true; buildDepends = [ - Cabal filepath HTTP mtl network tar transformers zlib + Cabal filepath HTTP mtl network tar transformers zlib setenv ]; buildTools = [ cabalInstall ]; meta = { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ff8fd6a24c77..51b08f8c30c2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2029,11 +2029,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cabal2nix = callPackage ../development/tools/haskell/cabal2nix {}; - cabalDev = callPackage ../development/tools/haskell/cabal-dev { - mtl = self.mtl_2_0_1_0.override { transformers = self.transformers_0_2_2_0; }; - transformers = self.transformers_0_2_2_0; - tar = self.tar_0_3_2_0; - }; + cabalDev = callPackage ../development/tools/haskell/cabal-dev {}; cabalGhci = callPackage ../development/tools/haskell/cabal-ghci {};