about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2014-03-05 15:23:36 +0100
committerPeter Simons <simons@cryp.to>2014-03-07 22:54:13 +0100
commitf5b3367e927e787ab836019f8d615013faa2ff25 (patch)
treecacd314ff383df36775a9fe9ad0a3792ef1e49e9
parent5446f60e8af7a30c9a13963b01e049cc75d06b57 (diff)
haskell-Cabal: update to version 1.18.1.3
-rw-r--r--pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix (renamed from pkgs/development/libraries/haskell/Cabal/1.18.1.2.nix)4
-rw-r--r--pkgs/top-level/haskell-defaults.nix6
-rw-r--r--pkgs/top-level/haskell-packages.nix12
3 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/development/libraries/haskell/Cabal/1.18.1.2.nix b/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix
index 024a4d5c13520..0ef09dc49b155 100644
--- a/pkgs/development/libraries/haskell/Cabal/1.18.1.2.nix
+++ b/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Cabal";
-  version = "1.18.1.2";
-  sha256 = "0pbg9d40lskcps248fdcnm4hnib3vl10mbcdf830zw45q29gfkjr";
+  version = "1.18.1.3";
+  sha256 = "1m1m6f00sc4w0s5hnqy2z05rnaihaw1jy03bidc5pl6r1llkdi15";
   buildDepends = [ deepseq filepath time ];
   testDepends = [
     extensibleExceptions filepath HUnit QuickCheck regexPosix
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index a3c3a10b44c05..3034367c39e98 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -80,7 +80,7 @@
       cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
       prettyShow = self.prettyShow_1_2;
       binary = self.binary_0_6_0_0;
-      Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; };
+      Cabal_1_18_1_3 = self.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; };
       quickcheckIo = self.quickcheckIo.override {
         HUnit = self.HUnit_1_2_5_2;
         QuickCheck = self.QuickCheck2;
@@ -102,7 +102,7 @@
       cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
       prettyShow = self.prettyShow_1_2;
       binary = self.binary_0_6_0_0;
-      Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; };
+      Cabal_1_18_1_3 = self.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; };
       quickcheckIo = self.quickcheckIo.override {
         HUnit = self.HUnit_1_2_5_2;
         QuickCheck = self.QuickCheck2;
@@ -126,7 +126,7 @@
       cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
       prettyShow = self.prettyShow_1_2;
       binary = self.binary_0_6_0_0;
-      Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; };
+      Cabal_1_18_1_3 = self.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; };
       quickcheckIo = self.quickcheckIo.override {
         HUnit = self.HUnit_1_2_5_2;
         QuickCheck = self.QuickCheck2;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index dd26587f5832c..b590eeb206a78 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -555,14 +555,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   ansiWlPprint = callPackage ../development/libraries/haskell/ansi-wl-pprint {};
 
   ariadne = callPackage ../development/libraries/haskell/ariadne {
-    Cabal = self.Cabal_1_18_1_2;
+    Cabal = self.Cabal_1_18_1_3;
     haskellPackages = self.haskellPackages.override {
-      Cabal = self.Cabal_1_18_1_2;
+      Cabal = self.Cabal_1_18_1_3;
     };
     haskellNames = self.haskellNames.override {
-      Cabal = self.Cabal_1_18_1_2;
+      Cabal = self.Cabal_1_18_1_3;
       haskellPackages = self.haskellPackages.override {
-        Cabal = self.Cabal_1_18_1_2;
+        Cabal = self.Cabal_1_18_1_3;
       };
     };
   };
@@ -709,7 +709,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix { cabal = self.cabal.override { Cabal = null; }; };
   Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix { cabal = self.cabal.override { Cabal = null; }; };
-  Cabal_1_18_1_2 = callPackage ../development/libraries/haskell/Cabal/1.18.1.2.nix { cabal = self.cabal.override { Cabal = null; }; };
+  Cabal_1_18_1_3 = callPackage ../development/libraries/haskell/Cabal/1.18.1.3.nix { cabal = self.cabal.override { Cabal = null; }; };
   Cabal = null; # core package in GHC
 
   cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {};
@@ -2863,7 +2863,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {};
   cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix {};
   cabalInstall_1_18_0_2 = callPackage ../tools/package-management/cabal-install/1.18.0.2.nix {
-    Cabal = self.Cabal_1_18_1_2;
+    Cabal = self.Cabal_1_18_1_3;
   };
   cabalInstall = self.cabalInstall_1_18_0_2;