summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/haskell-defaults.nix2
-rw-r--r--pkgs/top-level/haskell-packages.nix3
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index ad0da226542..ed7e33868ea 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -46,10 +46,12 @@
 
   ghc742Prefs = self : super : ghc763Prefs self super // {
     aeson = super.aeson.override { blazeBuilder = self.blazeBuilder; };
+    attoparsec = self.attoparsec_0_11_3_1;
     extensibleExceptions = null;        # core package in ghc <= 7.4.x
     hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_16_0_3; };
     haddock = self.haddock_2_11_0;
     haskeline = super.haskeline.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
+    scientific = self.scientific_0_2_0_2;
   };
 
   ghc722Prefs = self : super : ghc742Prefs self super // {
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c929665fe48..21cc618fc90 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -191,7 +191,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   attoparsec_0_10_4_0 = callPackage ../development/libraries/haskell/attoparsec/0.10.4.0.nix {};
   attoparsec_0_11_3_1 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.1.nix {};
-  attoparsec = self.attoparsec_0_11_3_1;
+  attoparsec_0_11_3_4 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.4.nix {};
+  attoparsec = self.attoparsec_0_11_3_4;
 
   attoparsecBinary = callPackage ../development/libraries/haskell/attoparsec-binary {};