From 9c26f3b2f430300c79e040dd006673ea1ae81e04 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 31 Jan 2015 17:06:37 +0100
Subject: [PATCH] hackage-packages.nix: re-generate from Hackage
 2015-02-01T12:17:28+0100

 - trifecta: build should succeed without patches now
 - th-desugar: version 1.5 breaks important packages (like singletons)
 - haskell-hannahci: mark "broken"
---
 .../haskell-modules/configuration-common.nix  |   9 +-
 .../haskell-modules/hackage-packages.nix      | 333 +++++++++++++-----
 2 files changed, 252 insertions(+), 90 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index deccb4c40a9..da425dceda1 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -136,12 +136,6 @@ self: super: {
   # https://github.com/liamoc/wizards/issues/5
   wizards = doJailbreak super.wizards;
 
-  # https://github.com/ekmett/trifecta/issues/41
-  trifecta = appendPatch super.trifecta (pkgs.fetchpatch {
-    url = "https://github.com/ekmett/trifecta/pull/40.patch";
-    sha256 = "0qwz83fp0karf6164jykdwsrafq08l6zsdmcdm83xnkcxabgplxv";
-  });
-
   # https://github.com/NixOS/cabal2nix/issues/136
   gtk = addBuildDepends super.gtk [pkgs.pkgconfig pkgs.gtk];
   glib = addBuildDepends super.glib [pkgs.pkgconfig pkgs.glib];
@@ -401,6 +395,9 @@ self: super: {
   call = markBrokenVersion "0.1.2" super.call;
   rhythm-game-tutorial = dontDistribute super.rhythm-game-tutorial;     # depends on call
 
+  # The install target tries to run lots of commands as "root". WTF???
+  hannahci = markBroken super.hannahci;
+
 } // {
 
   # Not on Hackage.
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index a4cd44f5948..0cc7273d42b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1693,8 +1693,8 @@ self: {
      }:
      mkDerivation {
        pname = "CCA";
-       version = "0.1.5.1";
-       sha256 = "11q33gpaiyvmd6amlh48k4i3wrj6axrnvyrvsrg6xhnlvvbibvwj";
+       version = "0.1.5.2";
+       sha256 = "16121708y4pdqzcg4s6i8rmz7jrzhndj1i86zn3xgnq2bgv1rxj4";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -6197,8 +6197,8 @@ self: {
      }:
      mkDerivation {
        pname = "HGraphStorage";
-       version = "0.0.2";
-       sha256 = "0gml8mmxmpk9si7vldaq46j4a3c2l1rsssgazc93jg31nli021a5";
+       version = "0.0.3";
+       sha256 = "1qbhzrw8sjxaz95b34w3w71dv79wlkmqjgvcsr79vxxfn4c83dfc";
        buildDepends = [
          base binary bytestring containers data-default directory filepath
          lifted-base monad-control monad-logger resourcet text transformers
@@ -9457,6 +9457,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "MSQueue" = callPackage
+    ({ mkDerivation, base, ghc-prim, monad-loops, ref-mtl, stm }:
+     mkDerivation {
+       pname = "MSQueue";
+       version = "0.0.1";
+       sha256 = "04yvf4a07cy47qzl9p8x45qbk2i6yapfps7hx85p589338s8b72y";
+       buildDepends = [ base ghc-prim monad-loops ref-mtl stm ];
+       homepage = "https://github.com/Julek";
+       description = "Michael-Scott queue";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "MagicHaskeller" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
      , ghc, ghc-paths, haskell-src, html, mtl, network, old-time, pretty
@@ -13951,8 +13963,8 @@ self: {
     ({ mkDerivation, base, ghc-prim, monad-loops, ref-mtl, stm }:
      mkDerivation {
        pname = "Treiber";
-       version = "0.0.3";
-       sha256 = "1mvf45jyi7x2bn185z73mx360xaq6w9fsgg4vvgf41d4nq274hgx";
+       version = "0.0.4";
+       sha256 = "09sd9p1y3zqkfahkp1vgdnlvgv1vnvdl7kdzccsd41h1h61fz3jd";
        buildDepends = [ base ghc-prim monad-loops ref-mtl stm ];
        homepage = "https://github.com/Julek";
        description = "Lock free Treiber stack";
@@ -21612,8 +21624,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "base-prelude";
-       version = "0.1.14";
-       sha256 = "09zjgsnk9c3nw92iymv0ai42wqis6yqb3z3pvslpvdv0a2g7jhgj";
+       version = "0.1.15";
+       sha256 = "0cw4ra08n9236vhbl9b9f50alc1ja8pafl5d9f367hm4ndx5scl6";
        buildDepends = [ base ];
        homepage = "https://github.com/nikita-volkov/base-prelude";
        description = "The most complete prelude formed from only the \"base\" package";
@@ -21665,8 +21677,8 @@ self: {
      }:
      mkDerivation {
        pname = "base58-bytestring";
-       version = "0.0.3";
-       sha256 = "1b0h6j8wnd4064kwa0h5fh04wzn40bxdxbw2bwvksz632k709w4q";
+       version = "0.1.0";
+       sha256 = "1ls05nzswjr6aw0wwk3q7cpv1hf0lw7vk16a5khm6l21yfcgbny2";
        buildDepends = [ base bytestring ];
        testDepends = [
          base bytestring quickcheck-assertions quickcheck-instances tasty
@@ -21809,8 +21821,8 @@ self: {
     ({ mkDerivation, aeson, base, containers, http-conduit, text }:
      mkDerivation {
        pname = "battlenet";
-       version = "0.1.0.1";
-       sha256 = "16wqz62lzzl6a8nb33z677dj21l64mwliwvsy14pnwz2086hbig8";
+       version = "0.2.0.0";
+       sha256 = "1nzli8n6lpa9jahwp3awvpafzfkx4j02bwanilh30sxfyp0mlxxa";
        buildDepends = [ aeson base containers http-conduit text ];
        homepage = "https://github.com/teozkr/hs-battlenet/";
        description = "API client for Battle.Net";
@@ -21818,12 +21830,12 @@ self: {
      }) {};
 
   "battlenet-yesod" = callPackage
-    ({ mkDerivation, base, battlenet, http-conduit, yesod-core }:
+    ({ mkDerivation, base, battlenet, http-conduit, text, yesod-core }:
      mkDerivation {
        pname = "battlenet-yesod";
-       version = "0.1.0.1";
-       sha256 = "14r7jjgn3migy2kg4jxs56nlw4dawm42dbx94f7xhq4pg8q27c3x";
-       buildDepends = [ base battlenet http-conduit yesod-core ];
+       version = "0.2.0.0";
+       sha256 = "056z84rha1nwjij3am16vfp4nwgp7xzqrhkvrx9s8p1vivyb80yz";
+       buildDepends = [ base battlenet http-conduit text yesod-core ];
        homepage = "https://github.com/teozkr/hs-battlenet/";
        description = "Yesod integration for the battlenet package";
        license = stdenv.lib.licenses.mit;
@@ -25147,6 +25159,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "buffer-builder" = callPackage
+    ({ mkDerivation, base, bytestring, HUnit, mtl, tasty, tasty-hunit
+     , tasty-th
+     }:
+     mkDerivation {
+       pname = "buffer-builder";
+       version = "0.1.0.0";
+       sha256 = "0pk3k3x03m9c7x7bgf9sah6wr4ry5j7hcdl5cp2v80d4nbkcdxx0";
+       buildDepends = [ base bytestring mtl ];
+       testDepends = [ base HUnit tasty tasty-hunit tasty-th ];
+       homepage = "https://github.com/chadaustin/buffer-builder";
+       description = "Library for efficiently building up buffers, one piece at a time";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bugzilla" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection
      , containers, data-default, http-conduit, http-types, iso8601-time
@@ -26929,15 +26956,15 @@ self: {
     ({ mkDerivation, base, haskeline, mtl, parsec, QuickCheck }:
      mkDerivation {
        pname = "calculator";
-       version = "0.1.4.0";
-       sha256 = "1sf1fljg65fvwrnxmpj1s66yqb7j6q9kwsn3rmc0bac23s7nrrjh";
+       version = "0.1.5.1";
+       sha256 = "1js7xg63kxddz54x5cscdmwmk86ggiz317gm4hprr5hjvvbfnfn5";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base haskeline mtl parsec QuickCheck ];
        testDepends = [ base mtl parsec QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/sumitsahrawat/calculator";
-       description = "A calculator that operates on string inputs";
+       description = "A calculator repl";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -27243,8 +27270,8 @@ self: {
      }:
      mkDerivation {
        pname = "casadi-bindings";
-       version = "2.2.0.1";
-       sha256 = "1bymk75snh0rqswdn2mlaf43msid5bbn7g353m9864jxrl57d4b2";
+       version = "2.2.0.2";
+       sha256 = "0cw1vk0zgml4czhbnafqsz3ipy43wnzfnmkxhr1qr022s03nhwyi";
        buildDepends = [
          base casadi-bindings-core casadi-bindings-internal containers
          linear vector
@@ -27277,8 +27304,8 @@ self: {
     ({ mkDerivation, base, casadi, casadi-bindings-internal, vector }:
      mkDerivation {
        pname = "casadi-bindings-core";
-       version = "2.2.0.1";
-       sha256 = "0ndsipaw1vn90fwjm0qk10hi4rdi3i6n9h29196w0yz4j0xd0l61";
+       version = "2.2.0.2";
+       sha256 = "1cpz8jzmcn5zx7bqm8920yrydhispgca8kijsq1zk5xnjasm5kva";
        buildDepends = [ base casadi-bindings-internal vector ];
        pkgconfigDepends = [ casadi ];
        description = "autogenerated low level bindings to casadi";
@@ -27290,8 +27317,8 @@ self: {
     ({ mkDerivation, base, casadi, vector }:
      mkDerivation {
        pname = "casadi-bindings-internal";
-       version = "0.1.2";
-       sha256 = "0c7q1wr64zhaafcny5lms7r1y7991lplw4dhj3h4f9b8cnhpfrc6";
+       version = "0.1.2.1";
+       sha256 = "0sh7j11pgrnmvcrdvvvvld2k0kbvccmh67rmbravshgx95nx7dli";
        buildDepends = [ base vector ];
        pkgconfigDepends = [ casadi ];
        homepage = "http://github.com/ghorn/casadi-bindings";
@@ -36535,8 +36562,8 @@ self: {
      }:
      mkDerivation {
        pname = "debian-build";
-       version = "0.5.0.0";
-       sha256 = "067snxyasryfdrbh67l0xrbg4lrk5m6m7fjsmb4gv2q9y63hbsxh";
+       version = "0.5.0.2";
+       sha256 = "11wz7kpbxcmxgkvc97dv0daca92f65miy8m3rwh816g4i7yx0vk0";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -36659,23 +36686,22 @@ self: {
      }) {};
 
   "deepseq-bounded" = callPackage
-    ({ mkDerivation, array, attoparsec, base, bytestring, cpphs
-     , deepseq, deepseq-generics, generics-sop, ghc-prim, HUnit, mtl
-     , parallel, random, syb, template-haskell, text
+    ({ mkDerivation, array, base, deepseq, deepseq-generics
+     , generics-sop, ghc-prim, HUnit, mtl, parallel, random, syb
+     , template-haskell
      }:
      mkDerivation {
        pname = "deepseq-bounded";
-       version = "0.6.0.3";
-       sha256 = "13cyxhh0fjwqg5ys7dcgbvbnwm9p4x7zvk8jrkfwr0py9w6vfdz6";
+       version = "0.7.0.1";
+       sha256 = "0ag8a4z4557j6gg15bh1ml7yqp77bvw2rgw0yppl04xr8gzif3dx";
        buildDepends = [
-         array attoparsec base bytestring cpphs deepseq deepseq-generics
-         generics-sop mtl parallel random syb text
+         array base deepseq deepseq-generics generics-sop mtl parallel
+         random syb
        ];
        testDepends = [
-         base cpphs deepseq deepseq-generics generics-sop ghc-prim HUnit
-         parallel random syb template-haskell
+         base deepseq deepseq-generics generics-sop ghc-prim HUnit parallel
+         random syb template-haskell
        ];
-       buildTools = [ cpphs ];
        homepage = "http://fremissant.net/deepseq-bounded";
        description = "Bounded deepseq, including support for generic deriving";
        license = stdenv.lib.licenses.bsd3;
@@ -39758,8 +39784,8 @@ self: {
     ({ mkDerivation, base, bytestring, postgresql-simple, text, time }:
      mkDerivation {
        pname = "drifter";
-       version = "0.1.0.0";
-       sha256 = "1myr310f0a7p602rwxly2382asnaywgavczkwdmqgaqyq70xv3l5";
+       version = "0.1.0.1";
+       sha256 = "1ldqlkxkshg4i1iqvjzq01cz9mxhyaszhybhq4kngd0rig3n1qhq";
        buildDepends = [ base bytestring postgresql-simple text time ];
        homepage = "https://github.com/AndrewRademacher/drifter";
        description = "Simple schema management for arbitrary databases";
@@ -40328,6 +40354,41 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "dynobud" = callPackage
+    ({ mkDerivation, base, bytestring, cairo, casadi-bindings
+     , casadi-bindings-core, casadi-bindings-internal, cereal, Chart
+     , Chart-cairo, Chart-gtk, cmdargs, colour, containers, data-default
+     , data-default-class, distributive, ghc-prim, glib, gtk, hmatrix
+     , HUnit, jacobi-roots, lens, linear, mtl, not-gloss, primitive
+     , process, QuickCheck, reflection, semigroups, spatial-math, stm
+     , tagged, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, transformers
+     , unordered-containers, vector, zeromq4-haskell
+     }:
+     mkDerivation {
+       pname = "dynobud";
+       version = "1.0.0.0";
+       sha256 = "018s2n4sbks43ifvd0vng65r0j8q18z1b38mny9lwfbpp60d2ql4";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base bytestring cairo casadi-bindings casadi-bindings-core
+         casadi-bindings-internal cereal Chart Chart-cairo Chart-gtk cmdargs
+         colour containers data-default data-default-class distributive
+         ghc-prim glib gtk hmatrix jacobi-roots lens linear mtl not-gloss
+         primitive process reflection semigroups spatial-math stm tagged
+         text time transformers unordered-containers vector zeromq4-haskell
+       ];
+       testDepends = [
+         base casadi-bindings hmatrix HUnit linear QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2 vector
+       ];
+       jailbreak = true;
+       description = "your dynamic optimization buddy";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dyre" = callPackage
     ({ mkDerivation, base, binary, directory, executable-path, filepath
      , ghc-paths, io-storage, process, time, unix, xdg-basedir
@@ -42408,8 +42469,8 @@ self: {
      }:
      mkDerivation {
        pname = "estimator";
-       version = "1.0.0.1";
-       sha256 = "0l1c2k4c5bpfr7h03fdcfnvm5nsv605sxnd8agi1v2qakwxhdjcp";
+       version = "1.1.0.0";
+       sha256 = "1qwbjy71zshlg8vp0qm5wya8ikgac9jpc5xr0x31i85p3yv5xl1p";
        buildDepends = [ ad base distributive lens linear reflection ];
        homepage = "https://github.com/GaloisInc/estimator";
        description = "State-space estimation algorithms such as Kalman Filters";
@@ -47433,6 +47494,18 @@ self: {
        license = "LGPL";
      }) {};
 
+  "generic-trie" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "generic-trie";
+       version = "0.1";
+       sha256 = "1cqzbwc6php2xr95a609fd29bvsclcbwcgx4r7mj0p9x891a8dcf";
+       buildDepends = [ base containers ];
+       homepage = "http://github.com/glguy/tries";
+       description = "A map, where the keys may be complex structured data";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "generic-xml" = callPackage
     ({ mkDerivation, base, HaXml, mtl, syb-with-class, template-haskell
      }:
@@ -53423,6 +53496,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hannahci" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, formatting
+     , http-types, lens, lens-aeson, process, scotty, text, transformers
+     , unix-time, wai-extra, wai-middleware-static, yaml
+     }:
+     mkDerivation {
+       pname = "hannahci";
+       version = "0.1.4.0";
+       sha256 = "0skkfpf69zhl3z5c0wjg5pb7250q1fixr97dvwg9c0d6qkdl5zlr";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         aeson base bytestring directory formatting http-types lens
+         lens-aeson process scotty text transformers unix-time wai-extra
+         wai-middleware-static yaml
+       ];
+       description = "Simple Continuous Integration/Deployment System";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "hans" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bytestring, cereal
      , containers, fingertree, HTTP, monadLib, old-locale, random, time
@@ -59839,6 +59932,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hjsonschema" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, filepath
+     , hashable, HUnit, lens, regexpr, scientific, test-framework
+     , test-framework-hunit, text, unordered-containers, vector, wreq
+     }:
+     mkDerivation {
+       pname = "hjsonschema";
+       version = "0.1.0.0";
+       sha256 = "0b7q90k96afkmk7x4dz5dikvbzpwbkpp2w0zymsz9fcfs5ddacnk";
+       buildDepends = [
+         aeson base bytestring hashable lens regexpr scientific text
+         unordered-containers vector wreq
+       ];
+       testDepends = [
+         aeson base bytestring directory filepath HUnit test-framework
+         test-framework-hunit text unordered-containers vector
+       ];
+       homepage = "https://github.com/seagreen/hjsonschema";
+       description = "Haskell implementation of JSON Schema v4";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hlatex" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, containers, derive
      , directory, filepath, frquotes, mtl, process, template-haskell
@@ -66388,8 +66503,8 @@ self: {
      }:
      mkDerivation {
        pname = "husk-scheme";
-       version = "3.18";
-       sha256 = "05m5ppcksy7yp5lx4k94y1khzg3vbfi8yjslpymbz6cj060mfpbp";
+       version = "3.19";
+       sha256 = "1y8b15cgiky6kasx21q4gw4h40scyby4mkqynq96kaq2yrrayd5q";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -71740,8 +71855,8 @@ self: {
      }:
      mkDerivation {
        pname = "keyword-args";
-       version = "0.1.0.4";
-       sha256 = "0zq65y5xkma2b6wj71f5i0x39bpr8i0nljqnnnlzdz9z8ddr1l8r";
+       version = "0.1.0.5";
+       sha256 = "050zm4fnz3a1wv5fgz192njzm1blpzrzy2jwahg97x9y6x514ya6";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base bytestring cassava containers parsec ];
@@ -73675,14 +73790,13 @@ self: {
      }:
      mkDerivation {
        pname = "leaky";
-       version = "0.2.1.0";
-       sha256 = "1byp6vrisb423cnlwbd211k8d85df8mwiqvl22w3wxv36dnvpah1";
-       editedCabalFile = "ffa60eac7cd683bbd27c5b8ec4ba9d9d2d1cc07e3b38bd6a2b062229200fc8e5";
+       version = "0.3.0.1";
+       sha256 = "049i61g1q9syly87yq5dkqnfaxpjx9z3dwy23zik5jxmpkw6nn1g";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base cpphs deepseq-bounded deepseq-generics generics-sop random
-         seqaid template-haskell
+         base deepseq-bounded deepseq-generics generics-sop random seqaid
+         template-haskell
        ];
        buildTools = [ cpphs ];
        homepage = "http://fremissant.net/leaky";
@@ -79603,6 +79717,7 @@ self: {
        pname = "minimal-configuration";
        version = "0.1.1";
        sha256 = "06r710l30kf5aaz2k446z9fhc6zshdsssp1zwri0572r1jryzd43";
+       editedCabalFile = "12049d8491610c2789c61e4736586d3fa8b1122c5c7657647c3de8d21073ef80";
        buildDepends = [ base containers directory filepath tconfig ];
        description = "Minimal ini like configuration library with a few extras";
        license = stdenv.lib.licenses.bsd3;
@@ -90935,8 +91050,8 @@ self: {
     ({ mkDerivation, base, generics-sop, postgresql-simple }:
      mkDerivation {
        pname = "postgresql-simple-sop";
-       version = "0.1.0.3";
-       sha256 = "1jnqps71r9kbflwwxnjdwi8r8fx4qc1lnp23vm34yq8wvv5sjnq2";
+       version = "0.1.0.5";
+       sha256 = "1v4rqjhwki6q46q5y4rmrk8y5p60s00faa153fg71zpkzafqqx0q";
        buildDepends = [ base generics-sop postgresql-simple ];
        homepage = "https://github.com/openbrainsrc/postgresql-simple-sop";
        description = "Generic functions for postgresql-simple";
@@ -90987,8 +91102,8 @@ self: {
     ({ mkDerivation, aeson, base, base64-string, bcrypt, blaze-builder
      , bytestring, case-insensitive, containers, convertible, hasql
      , hasql-backend, hasql-postgres, hspec, hspec-wai, hspec-wai-json
-     , HTTP, http-media, http-types, mtl, network, network-uri
-     , optparse-applicative, parsec, process, QuickCheck, Ranged-sets
+     , HTTP, http-media, http-types, MissingH, mtl, network, network-uri
+     , optparse-applicative, process, QuickCheck, Ranged-sets
      , regex-base, regex-tdfa, regex-tdfa-text, resource-pool
      , scientific, split, string-conversions, stringsearch, text, time
      , transformers, unordered-containers, vector, wai, wai-cors
@@ -90996,15 +91111,15 @@ self: {
      }:
      mkDerivation {
        pname = "postgrest";
-       version = "0.2.5.0";
-       sha256 = "1128s2yblmixqv3ywnzy3gsci9hncriyv21k09j1l81pjkk0cxgl";
+       version = "0.2.5.1";
+       sha256 = "1k9fy4arnq3nyz82ndqlqqw9i00g3d9n554ij49zhvjrc42drlng";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          aeson base base64-string bcrypt blaze-builder bytestring
          case-insensitive containers convertible hasql hasql-backend
-         hasql-postgres HTTP http-types mtl network network-uri
-         optparse-applicative parsec Ranged-sets regex-base regex-tdfa
+         hasql-postgres HTTP http-types MissingH mtl network network-uri
+         optparse-applicative Ranged-sets regex-base regex-tdfa
          regex-tdfa-text resource-pool scientific split string-conversions
          stringsearch text time transformers unordered-containers vector wai
          wai-cors wai-extra wai-middleware-static warp
@@ -91013,7 +91128,7 @@ self: {
          aeson base base64-string bcrypt blaze-builder bytestring
          case-insensitive containers convertible hasql hasql-backend
          hasql-postgres hspec hspec-wai hspec-wai-json HTTP http-media
-         http-types mtl network network-uri optparse-applicative parsec
+         http-types MissingH mtl network network-uri optparse-applicative
          process QuickCheck Ranged-sets regex-base regex-tdfa
          regex-tdfa-text resource-pool scientific split string-conversions
          stringsearch text time transformers unordered-containers vector wai
@@ -91956,6 +92071,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "processor-creative-kit" = callPackage
+    ({ mkDerivation, array, attoparsec, base, bytestring, containers
+     , deepseq, mtl
+     }:
+     mkDerivation {
+       pname = "processor-creative-kit";
+       version = "0.1.0.1";
+       sha256 = "1jshzych1vbb24bm219sdpxkb2amvv11fbhqwf7iy4l1prg248h7";
+       buildDepends = [
+         array attoparsec base bytestring containers deepseq mtl
+       ];
+       homepage = "https://github.com/takenobu-hs/processor-creative-kit";
+       description = "a creation kit for instruction sets and cpu simulators and development tools";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "procrastinating-structure" = callPackage
     ({ mkDerivation, base, procrastinating-variable }:
      mkDerivation {
@@ -97002,8 +97133,8 @@ self: {
      }:
      mkDerivation {
        pname = "rethinkdb-client-driver";
-       version = "0.0.11";
-       sha256 = "0dhz28f6cl9jslps02amax871f4dynb8h4f35gw9n66fz6zmwdwx";
+       version = "0.0.12";
+       sha256 = "1dwdgyryhk74l0dykjvrcicgdwlvl3gc9hfw3ag6vqfjcpaznvgd";
        buildDepends = [
          aeson base binary bytestring hashable mtl network old-locale
          scientific template-haskell text time unordered-containers vector
@@ -97012,7 +97143,6 @@ self: {
          base hspec hspec-smallcheck smallcheck text time
          unordered-containers vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/wereHamster/rethinkdb-client-driver";
        description = "Client driver for RethinkDB";
        license = stdenv.lib.licenses.mit;
@@ -100392,21 +100522,21 @@ self: {
      }) {};
 
   "seqaid" = callPackage
-    ({ mkDerivation, array, base, Cabal, containers, cpphs
-     , deepseq-bounded, directory, exceptions, filepath, ghc, ghc-paths
-     , mtl, process, regex-base, regex-pcre, syb, template-haskell
-     , temporary, transformers
+    ({ mkDerivation, array, base, Cabal, containers, deepseq-bounded
+     , directory, exceptions, filepath, ghc, ghc-paths, mtl, process
+     , regex-base, regex-pcre, syb, template-haskell, temporary
+     , transformers
      }:
      mkDerivation {
        pname = "seqaid";
-       version = "0.2.1.0";
-       sha256 = "1jfxi3ndipbvwfk41hnixpa3i7igkv2hjg4gzqrdibq6212fr3xw";
+       version = "0.3.0.0";
+       sha256 = "046932vdgm2mpbzijdnz561lsk6k2rq6qb5mk3pyx23g97whkx6w";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         array base Cabal containers cpphs deepseq-bounded directory
-         exceptions filepath ghc ghc-paths mtl process regex-base regex-pcre
-         syb template-haskell temporary transformers
+         array base Cabal containers deepseq-bounded directory exceptions
+         filepath ghc ghc-paths mtl process regex-base regex-pcre syb
+         template-haskell temporary transformers
        ];
        jailbreak = true;
        homepage = "http://fremissant.net/seqaid";
@@ -105977,8 +106107,8 @@ self: {
      }:
      mkDerivation {
        pname = "stable-tree";
-       version = "0.5.0";
-       sha256 = "0svg4mbsvynvmcfm6ihv6s90pfvi1zhawa19yns8n521ff2rxrjv";
+       version = "0.6.1";
+       sha256 = "02asd3qrnydmw70ibf2w2q6phkvrls1yvlrbwmwhqz839ry0jhyx";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -111353,6 +111483,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-desugar_1_5" = callPackage
+    ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb
+     , template-haskell, th-lift
+     }:
+     mkDerivation {
+       pname = "th-desugar";
+       version = "1.5";
+       sha256 = "18ailfvwiljscyzjxci6k9h05kf9wwb6dy3ms6q928cr80qnr4d5";
+       buildDepends = [
+         base containers mtl syb template-haskell th-lift
+       ];
+       testDepends = [
+         base containers hspec HUnit mtl syb template-haskell th-lift
+       ];
+       homepage = "http://www.cis.upenn.edu/~eir/packages/th-desugar";
+       description = "Functions to desugar Template Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "th-expand-syns" = callPackage
     ({ mkDerivation, base, containers, syb, template-haskell }:
      mkDerivation {
@@ -113548,8 +113697,8 @@ self: {
      }:
      mkDerivation {
        pname = "trifecta";
-       version = "1.5.1";
-       sha256 = "1fayr6sd9m84rqpcygacafn9vr9zva7rmkpvyzz0bf1p1z7i6b2n";
+       version = "1.5.1.1";
+       sha256 = "04wi1zq9k0fql6hqf6vbc5l4s160a4yq017x6ahs9zf5qkvz4jnk";
        buildDepends = [
          ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html
          blaze-markup bytestring charset comonad containers deepseq
@@ -113947,11 +114096,12 @@ self: {
        pname = "twentefp-eventloop-graphics";
        version = "0.1.0.4";
        sha256 = "086vx0849c7kmsz5pa4jwzp24cwaf4482bq37dr7jrqx22hvk4lm";
+       editedCabalFile = "2a887ef5e938d11f5944ea59ced4cf4bd22930b452f6e6b884f58031761cf817";
        buildDepends = [
          base network text twentefp-number twentefp-websockets
        ];
        jailbreak = true;
-       description = "Used as Lab Assignments Environment at Univeriteit Twente";
+       description = "Used as Lab Assignments Environment at the University of Twente";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -115170,8 +115320,8 @@ self: {
      }:
      mkDerivation {
        pname = "uhc-light";
-       version = "1.1.8.4";
-       sha256 = "0fkw5mz1wrrbcb1a9mfg59mab5b0clil8zm53q1mhnjhd7g7gd33";
+       version = "1.1.8.5";
+       sha256 = "0kvkylxbfywgyycj7wzrvpljw864qvsksrf46az66k92s7xaa1bx";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -116650,6 +116800,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "usb-hid" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, usb }:
+     mkDerivation {
+       pname = "usb-hid";
+       version = "0.1.0.0";
+       sha256 = "0mx4f1zrk098c9isczni66i8qisx54r85kwyk2s238dznlys39gh";
+       editedCabalFile = "3fe150e203f72b72c425bef276254a2ca91ca40cab21f6088838bb32c806e8dc";
+       buildDepends = [ attoparsec base bytestring usb ];
+       homepage = "https://github.com/mapinguari/usb-hid";
+       description = "Parser and request Library for USB HIDs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "usb-id-database" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, bytestring, containers
      , containers-unicode-symbols, parsimony
@@ -119765,15 +119928,17 @@ self: {
      }) {};
 
   "web-routing" = callPackage
-    ({ mkDerivation, base, bytestring, doctest, tasty, tasty-quickcheck
-     , text, unordered-containers
+    ({ mkDerivation, base, bytestring, doctest, primitive, text
+     , unordered-containers
      }:
      mkDerivation {
        pname = "web-routing";
-       version = "0.1.2";
-       sha256 = "1gc9p5bggb8z8zy28zs7q2nvhfjv3yd41c7lh8h1cfywilbif1ls";
-       buildDepends = [ base bytestring text unordered-containers ];
-       testDepends = [ base doctest tasty tasty-quickcheck ];
+       version = "0.4.0";
+       sha256 = "1mj0i2idmg67aw343g88k2pc126c89pfwk1jgjsv6fds0g50jrsw";
+       buildDepends = [
+         base bytestring primitive text unordered-containers
+       ];
+       testDepends = [ base doctest ];
        homepage = "https://github.com/philopon/web-routing";
        description = "simple routing library";
        license = stdenv.lib.licenses.mit;