summary refs log tree commit diff
path: root/pkgs/top-level/haskell-packages.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
-rw-r--r--pkgs/top-level/haskell-packages.nix114
1 files changed, 66 insertions, 48 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e21985b5ab30..4bcce23fc3b6 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -139,42 +139,42 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   haskellPlatformArgs_future = self : {
     inherit (self) cabal ghc;
-    async        = self.async_2_0_1_4;          # 7.6 ok
-    attoparsec   = self.attoparsec_0_10_4_0;    # 7.6 ok
+    async        = self.async_2_0_1_4;
+    attoparsec   = self.attoparsec_0_10_4_0;
     caseInsensitive = self.caseInsensitive_1_0_0_1;
-    cgi          = self.cgi_3001_1_7_5;         # 7.6 ok
-    fgl          = self.fgl_5_4_2_4;            # 7.6 ok
-    GLUT         = self.GLUT_2_4_0_0;           # 7.6 ok
-    GLURaw       = self.GLURaw_1_3_0_0;         # 7.6 ok
-    haskellSrc   = self.haskellSrc_1_0_1_5;     # 7.6 ok
-    hashable     = self.hashable_1_1_2_5;       # 7.6 ok
-    html         = self.html_1_0_1_2;           # 7.6 ok
-    HTTP         = self.HTTP_4000_2_8;          # 7.6 ok
-    HUnit        = self.HUnit_1_2_5_2;          # 7.6 ok
-    mtl          = self.mtl_2_1_2;              # 7.6 ok
-    network      = self.network_2_4_1_2;        # 7.6 ok
-    OpenGL       = self.OpenGL_2_8_0_0;         # 7.6 ok
-    OpenGLRaw    = self.OpenGLRaw_1_3_0_0;      # 7.6 ok
-    parallel     = self.parallel_3_2_0_3;       # 7.6 ok
-    parsec       = self.parsec_3_1_3;           # 7.6 ok
-    QuickCheck   = self.QuickCheck_2_6;         # 7.6 ok
-    random       = self.random_1_0_1_1;         # 7.6 ok
-    regexBase    = self.regexBase_0_93_2;       # 7.6 ok
-    regexCompat  = self.regexCompat_0_95_1;     # 7.6 ok
-    regexPosix   = self.regexPosix_0_95_2;      # 7.6 ok
-    split        = self.split_0_2_2;            # 7.6 ok
-    stm          = self.stm_2_4_2;              # 7.6 ok
-    syb          = self.syb_0_4_0;              # 7.6 ok
-    text         = self.text_0_11_3_1;          # 7.6 ok
-    transformers = self.transformers_0_3_0_0;   # 7.6 ok
+    cgi          = self.cgi_3001_1_7_5;
+    fgl          = self.fgl_5_4_2_4;
+    GLUT         = self.GLUT_2_4_0_0;
+    GLURaw       = self.GLURaw_1_3_0_0;
+    haskellSrc   = self.haskellSrc_1_0_1_5;
+    hashable     = self.hashable_1_2_0_10;
+    html         = self.html_1_0_1_2;
+    HTTP         = self.HTTP_4000_2_8;
+    HUnit        = self.HUnit_1_2_5_2;
+    mtl          = self.mtl_2_1_2;
+    network      = self.network_2_4_1_2;
+    OpenGL       = self.OpenGL_2_8_0_0;
+    OpenGLRaw    = self.OpenGLRaw_1_3_0_0;
+    parallel     = self.parallel_3_2_0_3;
+    parsec       = self.parsec_3_1_3;
+    QuickCheck   = self.QuickCheck_2_6;
+    random       = self.random_1_0_1_1;
+    regexBase    = self.regexBase_0_93_2;
+    regexCompat  = self.regexCompat_0_95_1;
+    regexPosix   = self.regexPosix_0_95_2;
+    split        = self.split_0_2_2;
+    stm          = self.stm_2_4_2;
+    syb          = self.syb_0_4_0;
+    text         = self.text_0_11_3_1;
+    transformers = self.transformers_0_3_0_0;
     unorderedContainers = self.unorderedContainers_0_2_3_0;
-    vector       = self.vector_0_10_0_1;        # 7.6 ok
-    xhtml        = self.xhtml_3000_2_1;         # 7.6 ok
-    zlib         = self.zlib_0_5_4_1;           # 7.6 ok
-    cabalInstall = self.cabalInstall_1_16_0_2;  # 7.6 ok
-    alex         = self.alex_3_0_5;             # 7.6 ok
-    haddock      = self.haddock_2_13_2;         # 7.6 ok
-    happy        = self.happy_1_18_10;          # 7.6 ok
+    vector       = self.vector_0_10_0_1;
+    xhtml        = self.xhtml_3000_2_1;
+    zlib         = self.zlib_0_5_4_1;
+    cabalInstall = self.cabalInstall_1_16_0_2;
+    alex         = self.alex_3_0_5;
+    haddock      = self.haddock_2_13_2;
+    happy        = self.happy_1_18_10;
     primitive    = self.primitive_0_5_0_1;      # semi-official, but specified
   };
 
@@ -500,11 +500,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   acidState = callPackage ../development/libraries/haskell/acid-state {};
 
-  Agda = callPackage ../development/libraries/haskell/Agda {
-    hashable = self.hashable_1_1_2_5;
-    hashtables = self.hashtables.override { hashable = self.hashable_1_1_2_5; };
-    unorderedContainers = self.unorderedContainers.override { hashable = self.hashable_1_1_2_5; };
-  };
+  Agda = callPackage ../development/libraries/haskell/Agda {};
 
   accelerate = callPackage ../development/libraries/haskell/accelerate {};
 
@@ -589,7 +585,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   bimap = callPackage ../development/libraries/haskell/bimap {};
 
-  binary = callPackage ../development/libraries/haskell/binary {};
+  binary_0_6_0_0 = callPackage ../development/libraries/haskell/binary/0.6.0.0.nix {};
+  binary_0_7_1_0 = callPackage ../development/libraries/haskell/binary/0.7.1.0.nix {};
+  binary = self.binary_0_7_1_0;
 
   binaryShared = callPackage ../development/libraries/haskell/binary-shared {};
 
@@ -629,6 +627,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   boomerang = callPackage ../development/libraries/haskell/boomerang {};
 
+  bytedump = callPackage ../development/libraries/haskell/bytedump {};
+
   byteorder = callPackage ../development/libraries/haskell/byteorder {};
 
   bytestringNums = callPackage ../development/libraries/haskell/bytestring-nums {};
@@ -682,6 +682,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   Chart = callPackage ../development/libraries/haskell/Chart {};
 
+  ChartGtk = callPackage ../development/libraries/haskell/Chart-gtk {};
+
   ChasingBottoms = callPackage ../development/libraries/haskell/ChasingBottoms {};
 
   checkers = callPackage ../development/libraries/haskell/checkers {};
@@ -1076,8 +1078,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   happstackHamlet = callPackage ../development/libraries/haskell/happstack/happstack-hamlet.nix {};
 
   hashable_1_1_2_5 = callPackage ../development/libraries/haskell/hashable/1.1.2.5.nix {};
-  hashable_1_2_0_7 = callPackage ../development/libraries/haskell/hashable/1.2.0.7.nix {};
-  hashable = self.hashable_1_2_0_7;
+  hashable_1_2_0_10 = callPackage ../development/libraries/haskell/hashable/1.2.0.10.nix {};
+  hashable = self.hashable_1_2_0_10;
 
   hashedStorage = callPackage ../development/libraries/haskell/hashed-storage {};
 
@@ -1143,6 +1145,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   heist = callPackage ../development/libraries/haskell/heist {};
 
+  hflags = callPackage ../development/libraries/haskell/hflags {};
+
   HFuse = callPackage ../development/libraries/haskell/HFuse {};
 
   highlightingKate = callPackage ../development/libraries/haskell/highlighting-kate {};
@@ -1153,11 +1157,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   Hipmunk = callPackage ../development/libraries/haskell/Hipmunk {};
 
+  hit = callPackage ../development/libraries/haskell/hit {};
+
   hjsmin = callPackage ../development/libraries/haskell/hjsmin {};
 
   hledger = callPackage ../development/libraries/haskell/hledger {};
   hledgerLib = callPackage ../development/libraries/haskell/hledger-lib {};
   hledgerInterest = callPackage ../applications/office/hledger-interest {};
+  hledgerIrr = callPackage ../applications/office/hledger-irr {};
   hledgerWeb = callPackage ../development/libraries/haskell/hledger-web {};
 
   HList = callPackage ../development/libraries/haskell/HList {};
@@ -1192,6 +1199,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   HsOpenSSL = callPackage ../development/libraries/haskell/HsOpenSSL {};
 
+  hsshellscript = callPackage ../development/libraries/haskell/hsshellscript {};
+
   HStringTemplate = callPackage ../development/libraries/haskell/HStringTemplate {};
 
   hspread = callPackage ../development/libraries/haskell/hspread {};
@@ -1559,11 +1568,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   pipes = callPackage ../development/libraries/haskell/pipes {};
 
-  pipes-concurrency = callPackage ../development/libraries/haskell/pipes-concurrency {};
+  pipesConcurrency = callPackage ../development/libraries/haskell/pipes-concurrency {};
 
-  pipes-parse = callPackage ../development/libraries/haskell/pipes-parse {};
+  pipesParse = callPackage ../development/libraries/haskell/pipes-parse {};
 
-  pipes-safe = callPackage ../development/libraries/haskell/pipes-safe {};
+  pipesSafe = callPackage ../development/libraries/haskell/pipes-safe {};
 
   polyparse = callPackage ../development/libraries/haskell/polyparse {};
 
@@ -1682,6 +1691,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   regexTDFA = callPackage ../development/libraries/haskell/regex-tdfa {};
   regexTdfa = self.regexTDFA;
 
+  regexTdfaText = callPackage ../development/libraries/haskell/regex-tdfa-text {};
+
   regexPCRE = callPackage ../development/libraries/haskell/regex-pcre {};
   regexPcre = self.regexPCRE;
 
@@ -1870,6 +1881,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   tagstreamConduit = callPackage ../development/libraries/haskell/tagstream-conduit {};
 
+  templateDefault = callPackage ../development/libraries/haskell/template-default {};
+
   temporary = callPackage ../development/libraries/haskell/temporary {};
 
   Tensor = callPackage ../development/libraries/haskell/Tensor {};
@@ -1995,8 +2008,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   vect = callPackage ../development/libraries/haskell/vect {};
 
-  vector_0_9_1 = callPackage ../development/libraries/haskell/vector/0.9.1.nix {};
-  vector_0_10 = callPackage ../development/libraries/haskell/vector/0.10.nix  {};
   vector_0_10_0_1  = callPackage ../development/libraries/haskell/vector/0.10.0.1.nix  {};
   vector = self.vector_0_10_0_1;
 
@@ -2008,6 +2019,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   vectorSpacePoints = callPackage ../development/libraries/haskell/vector-space-points {};
 
+  vectorThUnbox = callPackage ../development/libraries/haskell/vector-th-unbox {};
+
   void = callPackage ../development/libraries/haskell/void {};
 
   vty = callPackage ../development/libraries/haskell/vty {};
@@ -2093,6 +2106,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   xmlTypes = callPackage ../development/libraries/haskell/xml-types {};
 
+  xtest = callPackage ../development/libraries/haskell/xtest {};
+
   xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {};
 
   yaml = callPackage ../development/libraries/haskell/yaml {};
@@ -2105,6 +2120,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   yesodAuth = callPackage ../development/libraries/haskell/yesod-auth {};
 
+  yesodBin = callPackage ../development/libraries/haskell/yesod-bin {};
+
   yesodCore = callPackage ../development/libraries/haskell/yesod-core {};
 
   yesodDefault = callPackage ../development/libraries/haskell/yesod-default {};
@@ -2202,7 +2219,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   haddock_2_11_0 = callPackage ../development/tools/documentation/haddock/2.11.0.nix {};
   haddock_2_12_0 = callPackage ../development/tools/documentation/haddock/2.12.0.nix {};
   haddock_2_13_2 = callPackage ../development/tools/documentation/haddock/2.13.2.nix {};
-  haddock = self.haddock_2_13_2;
+  haddock_2_13_2_1 = callPackage ../development/tools/documentation/haddock/2.13.2.1.nix {};
+  haddock = self.haddock_2_13_2_1;
 
   happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {};
   happy_1_18_5 = callPackage ../development/tools/parsing/happy/1.18.5.nix {};