cabal-dev: update to Git version to fix build with ghc 7.6.2

This commit is contained in:
Peter Simons 2013-02-24 10:42:08 +01:00
parent 8e148fa50e
commit c2fc8c6da3
2 changed files with 10 additions and 10 deletions

View File

@ -1,15 +1,19 @@
{ cabal, Cabal, cabalInstall, filepath, HTTP, mtl, network, tar { cabal, fetchurl, Cabal, cabalInstall, filepath, HTTP, mtl, network, tar
, transformers, zlib , transformers, zlib, setenv
}: }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "cabal-dev"; pname = "cabal-dev";
version = "0.9.1"; version = "0.9.1-git";
sha256 = "1brz0nw959jdyjrhjqy9sixsb316hjmw4pxxsybfl8vixsivdfh6"; src = fetchurl {
url = "https://github.com/creswick/cabal-dev/archive/54e7d93d5b309c56192c146c7a807ac3591bc464.tar.gz";
sha256 = "1isi02jik0vrg48l7r2mj4cf9ms6hpxxz1mmhl7s3kkxx775cxj9";
name = "${self.name}.tar.gz";
};
isLibrary = false; isLibrary = false;
isExecutable = true; isExecutable = true;
buildDepends = [ buildDepends = [
Cabal filepath HTTP mtl network tar transformers zlib Cabal filepath HTTP mtl network tar transformers zlib setenv
]; ];
buildTools = [ cabalInstall ]; buildTools = [ cabalInstall ];
meta = { meta = {

View File

@ -2029,11 +2029,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
cabal2nix = callPackage ../development/tools/haskell/cabal2nix {}; cabal2nix = callPackage ../development/tools/haskell/cabal2nix {};
cabalDev = callPackage ../development/tools/haskell/cabal-dev { 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;
};
cabalGhci = callPackage ../development/tools/haskell/cabal-ghci {}; cabalGhci = callPackage ../development/tools/haskell/cabal-ghci {};