From 88fa30e8f293f3a896366e305888f9f05cc178e7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 19 Apr 2015 19:56:45 +0200 Subject: [PATCH] haskell-configuration-ghc-7.10.x: clean-up --- .../haskell-modules/configuration-ghc-7.10.x.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index c2889555e53..e73e7e7d743 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -126,19 +126,8 @@ self: super: { # Test suite fails in "/tokens_bytestring_unicode.g.bin". alex = dontCheck super.alex; - # TODO: should eventually update the versions in hackage-packages.nix - haddock-library = overrideCabal super.haddock-library (drv: { - version = "1.2.0"; - sha256 = "0kf8qihkxv86phaznb3liq6qhjs53g3iq0zkvz5wkvliqas4ha56"; - }); - haddock-api = overrideCabal super.haddock-api (drv: { - version = "2.16.0"; - sha256 = "0hk42w6fbr6xp8xcpjv00bhi9r75iig5kp34vxbxdd7k5fqxr1hj"; - }); - haddock = overrideCabal super.haddock (drv: { - version = "2.16.0"; - sha256 = "1afb96w1vv3gmvha2f1h3p8zywpdk8dfk6bgnsa307ydzsmsc3qa"; - }); + # TODO: update generation code in cabal2nix + haddock-library = self.haddock-library_1_2_0; # Upstream was notified about the over-specified constraint on 'base' # but refused to do anything about it because he "doesn't want to