summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2014-05-24 10:54:33 +0200
committerPeter Simons <simons@cryp.to>2014-05-24 12:00:58 +0200
commitecaf15c324987c96014a44c85fd19e5d817ff042 (patch)
tree128d354c2765d7e1c66f4dd013d742178174a51d /pkgs
parent9b86fb4ea490a17167802c4df70f8fc0c110a711 (diff)
downloadnixpkgs-ecaf15c324987c96014a44c85fd19e5d817ff042.tar
nixpkgs-ecaf15c324987c96014a44c85fd19e5d817ff042.tar.gz
nixpkgs-ecaf15c324987c96014a44c85fd19e5d817ff042.tar.bz2
nixpkgs-ecaf15c324987c96014a44c85fd19e5d817ff042.tar.lz
nixpkgs-ecaf15c324987c96014a44c85fd19e5d817ff042.tar.xz
nixpkgs-ecaf15c324987c96014a44c85fd19e5d817ff042.tar.zst
nixpkgs-ecaf15c324987c96014a44c85fd19e5d817ff042.zip
haskell-attoparsec: add version 0.11.3.4
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix20
-rw-r--r--pkgs/top-level/haskell-defaults.nix2
-rw-r--r--pkgs/top-level/haskell-packages.nix3
3 files changed, 24 insertions, 1 deletions
diff --git a/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix b/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix
new file mode 100644
index 00000000000..4af501e7dca
--- /dev/null
+++ b/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix
@@ -0,0 +1,20 @@
+{ cabal, deepseq, QuickCheck, scientific, testFramework
+, testFrameworkQuickcheck2, text
+}:
+
+cabal.mkDerivation (self: {
+  pname = "attoparsec";
+  version = "0.11.3.4";
+  sha256 = "1zahmkb0n7jz0di35x3r8s0xnfg1awqybh2x2zicxbwazl4f53hi";
+  buildDepends = [ deepseq scientific text ];
+  testDepends = [
+    QuickCheck testFramework testFrameworkQuickcheck2 text
+  ];
+  meta = {
+    homepage = "https://github.com/bos/attoparsec";
+    description = "Fast combinator parsing for bytestrings and text";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
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 {};