about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2014-09-10 20:42:58 +0200
committerPeter Simons <simons@cryp.to>2014-09-14 00:06:40 +0200
commit74d42b548aad2ff51900afba6a1ed904c555ead0 (patch)
tree7edf9e65e533f34d526efa77dc785335370d2320 /pkgs
parent78442b00b1a6941aadc26f95411cd593f9ab7733 (diff)
downloadnixlib-74d42b548aad2ff51900afba6a1ed904c555ead0.tar
nixlib-74d42b548aad2ff51900afba6a1ed904c555ead0.tar.gz
nixlib-74d42b548aad2ff51900afba6a1ed904c555ead0.tar.bz2
nixlib-74d42b548aad2ff51900afba6a1ed904c555ead0.tar.lz
nixlib-74d42b548aad2ff51900afba6a1ed904c555ead0.tar.xz
nixlib-74d42b548aad2ff51900afba6a1ed904c555ead0.tar.zst
nixlib-74d42b548aad2ff51900afba6a1ed904c555ead0.zip
haskell-parsec: update to version 3.1.6
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/haskell/parsec/3.1.6.nix (renamed from pkgs/development/libraries/haskell/parsec/3.1.5.nix)7
-rw-r--r--pkgs/top-level/haskell-defaults.nix1
-rw-r--r--pkgs/top-level/haskell-packages.nix4
3 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/libraries/haskell/parsec/3.1.5.nix b/pkgs/development/libraries/haskell/parsec/3.1.6.nix
index b6a5d37e5312..5a8d83622f54 100644
--- a/pkgs/development/libraries/haskell/parsec/3.1.5.nix
+++ b/pkgs/development/libraries/haskell/parsec/3.1.6.nix
@@ -1,12 +1,13 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, mtl, text }:
+{ cabal, HUnit, mtl, testFramework, testFrameworkHunit, text }:
 
 cabal.mkDerivation (self: {
   pname = "parsec";
-  version = "3.1.5";
-  sha256 = "1f1wg4qxp1ss2160sa3vbqff18fabwhqjkyfj4sgyfmwf9fj8wn5";
+  version = "3.1.6";
+  sha256 = "12k2gzy7fi83929mr2s4vj3ipfyg7l74v1cb2vbi4613qmq5wrw4";
   buildDepends = [ mtl text ];
+  testDepends = [ HUnit testFramework testFrameworkHunit ];
   jailbreak = true;
   meta = {
     homepage = "http://www.cs.uu.nl/~daan/parsec.html";
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 9a064212a40e..4fcab8e9d6de 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -131,6 +131,7 @@
     network = super.network_2_2_1_7.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     OpenGLRaw = self.OpenGLRaw_1_3_0_0;
     OpenGL = self.OpenGL_2_6_0_1;
+    parsec = super.parsec.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     QuickCheck = super.QuickCheck.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     stm = self.stm_2_4_2.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     systemFilepath = super.systemFilepath.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 8af09a49f9c5..446f60cc95f3 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1835,8 +1835,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   parsec_3_1_1   = callPackage ../development/libraries/haskell/parsec/3.1.1.nix {};
   parsec_3_1_2   = callPackage ../development/libraries/haskell/parsec/3.1.2.nix {};
   parsec_3_1_3   = callPackage ../development/libraries/haskell/parsec/3.1.3.nix {};
-  parsec_3_1_5   = callPackage ../development/libraries/haskell/parsec/3.1.5.nix {};
-  parsec = self.parsec_3_1_5;
+  parsec_3_1_6   = callPackage ../development/libraries/haskell/parsec/3.1.6.nix {};
+  parsec = self.parsec_3_1_6;
 
   parsers = callPackage ../development/libraries/haskell/parsers {};