From d4843286195c5556eb6431bd45b664d9019f3e08 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 9 May 2015 11:40:02 +0200
Subject: [PATCH] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/7424fa13dba1209a3dccbd01c99675ea44e41b05
 with hackage2nix revision 5e6df99a29c3e80bb071af288038312b19baf022

---
 .../haskell-modules/hackage-packages.nix      | 51 +++++++++++++------
 1 file changed, 36 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 93c7bbbf43ac..56c6418afc6b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -12497,6 +12497,7 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Draw RNA secondary structures";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RNAwolf" = callPackage
@@ -14777,6 +14778,7 @@ self: {
        homepage = "https://github.com/avieth/TypeNat";
        description = "Some Nat-indexed types for GHC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TypingTester" = callPackage
@@ -29306,8 +29308,8 @@ self: {
      }:
      mkDerivation {
        pname = "caramia";
-       version = "0.7.2.1";
-       sha256 = "01l6i8cb2q73vc4w6fbn90mkx7sxxsnwzhj0jg4yjhnrg4js0hlh";
+       version = "0.7.2.2";
+       sha256 = "1cvpyad7kmkndan1bfpfaav6lara8g78x02pgascrq8n73b2jcgs";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -29318,7 +29320,6 @@ self: {
          base containers HUnit linear sdl2 test-framework
          test-framework-hunit test-framework-quickcheck2 transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/Noeda/caramia/";
        description = "High-level OpenGL bindings";
        license = stdenv.lib.licenses.mit;
@@ -32480,10 +32481,13 @@ self: {
      mkDerivation {
        pname = "cndict";
        version = "0.6.1";
+       revision = "1";
        sha256 = "0pi0n1chwv6y3ch7dw2smrllwsdiy6r295lmmsnfnbprc8w6gksq";
+       editedCabalFile = "6371863e768d5b9d01f80b10783bb7ab4530e8e168d0c0bcc0fcee2a4f1aa468";
        buildDepends = [
          base binary bytestring cassava containers file-embed text vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/Lemmih/cndict";
        description = "Chinese/Mandarin <-> English dictionary, Chinese lexer";
        license = stdenv.lib.licenses.publicDomain;
@@ -93346,26 +93350,26 @@ self: {
 
   "opml-conduit" = callPackage
     ({ mkDerivation, base, case-insensitive, conduit
-     , conduit-combinators, containers, data-default, exceptions, lens
-     , mono-traversable, monoid-subclasses, mtl, network-uri, QuickCheck
+     , conduit-combinators, containers, data-default, exceptions
+     , hashable, hashable-time, hlint, lens, mono-traversable
+     , monoid-subclasses, mtl, network-uri, QuickCheck
      , quickcheck-instances, resourcet, semigroups, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, timerep, xml-conduit, xml-types
+     , tasty-quickcheck, text, time, timerep, unordered-containers
+     , xml-conduit, xml-types
      }:
      mkDerivation {
        pname = "opml-conduit";
-       version = "0.1.0.0";
-       revision = "2";
-       sha256 = "055ngv2ibb7bk99y67ag9y7xxhyzag08mgb6zf1aqfjgpna6dkcf";
-       editedCabalFile = "74ca928e036892a1db09b1309addb87cba9dd7332fc5c9aab8413e6635e357c9";
+       version = "0.2.0.0";
+       sha256 = "0dpsxssr8h3ph9c5plrmpxv9mv1mg5zb3wrwfbkyb5g7ja91qs4b";
        buildDepends = [
          base case-insensitive conduit containers data-default exceptions
-         lens mono-traversable monoid-subclasses network-uri QuickCheck
-         quickcheck-instances semigroups text time timerep xml-conduit
-         xml-types
+         hashable hashable-time lens mono-traversable monoid-subclasses
+         network-uri QuickCheck quickcheck-instances semigroups text time
+         timerep unordered-containers xml-conduit xml-types
        ];
        testDepends = [
-         base conduit conduit-combinators containers exceptions lens mtl
-         network-uri resourcet tasty tasty-hunit tasty-quickcheck
+         base conduit conduit-combinators containers exceptions hlint lens
+         mtl network-uri resourcet tasty tasty-hunit tasty-quickcheck
          xml-conduit
        ];
        homepage = "https://github.com/k0ral/opml-conduit";
@@ -99414,6 +99418,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "prettyFunctionComposing" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "prettyFunctionComposing";
+       version = "1.0.1";
+       sha256 = "0c39dyjlcrah1aq2rkk7zqysmzxqym6chv8x9zmifclvn5a4j98b";
+       buildDepends = [ base ];
+       description = "prettier function composition by (°)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "prettyclass" = callPackage
     ({ mkDerivation, base, pretty }:
      mkDerivation {
@@ -99755,8 +99770,11 @@ self: {
      mkDerivation {
        pname = "process-listlike";
        version = "1.0";
+       revision = "1";
        sha256 = "0yaz90pfpx9kahwbvbvl2ir62imxxsq7v72i67ac2zv3585c427r";
+       editedCabalFile = "72b239b889868394c365985197588cda0ec8aac03d4796a9e212b4044c966f16";
        buildDepends = [ base bytestring deepseq ListLike process text ];
+       jailbreak = true;
        homepage = "https://github.com/ddssff/process-listlike";
        description = "Process extras";
        license = stdenv.lib.licenses.mit;
@@ -113494,6 +113512,7 @@ self: {
        homepage = "https://github.com/mhwombat/som";
        description = "Self-Organising Maps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sonic-visualiser" = callPackage
@@ -119738,6 +119757,7 @@ self: {
        homepage = "https://github.com/luciferous/termbox-bindings";
        description = "Bindings to the termbox library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { termbox = null;};
 
   "terminal-progress-bar" = callPackage
@@ -125284,6 +125304,7 @@ self: {
        homepage = "http://github.com/lambdageek/unbound-generics";
        description = "Support for programming with names and binders using GHC Generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unbounded-delays" = callPackage