Merge remote-tracking branch 'origin/master' into staging

85 files changed, 325 insertions, 288 deletions

diff --git a/pkgs/applications/science/math/sloane/default.nix b/pkgs/applications/science/math/sloane/default.nix
index bf2cf32d646..72c2028e63c 100644
--- a/pkgs/applications/science/math/sloane/default.nix
+++ b/pkgs/applications/science/math/sloane/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, ansiTerminal, filepath, HTTP, network, optparseApplicative
 , terminalSize, text, time, zlib
 }:
diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix
index b564242c946..d53b38c28c3 100644
--- a/pkgs/applications/version-management/darcs/default.nix
+++ b/pkgs/applications/version-management/darcs/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, curl, extensibleExceptions, filepath, hashedStorage
 , haskeline, html, HTTP, mmap, mtl, network, parsec, random
 , regexCompat, tar, terminfo, text, utf8String, vector, zlib
@@ -15,15 +17,15 @@ cabal.mkDerivation (self: {
     utf8String vector zlib
   ];
   extraLibraries = [ curl ];
+  jailbreak = true;
   doCheck = false;
   postInstall = ''
     mkdir -p $out/etc/bash_completion.d
     mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
   '';
-  jailbreak = true;
   meta = {
-    homepage = http://darcs.net/;
-    description = "A distributed, interactive, smart revision control system";
+    homepage = "http://darcs.net/";
+    description = "a distributed, interactive, smart revision control system";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 59bcda0c29e..6764c232bd8 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, aeson, async, blazeBuilder, bloomfilter, bup, byteable
 , caseInsensitive, clientsession, cryptoApi, cryptohash, curl
 , dataDefault, dataenc, DAV, dbus, dlist, dns, editDistance
@@ -10,20 +12,20 @@
 , SHA, shakespeare, stm, tasty, tastyHunit, tastyQuickcheck
 , tastyRerun, text, time, transformers, unixCompat, utf8String
 , uuid, wai, waiExtra, warp, warpTls, which, xmlTypes, yesod
-, yesodCore, yesodDefault, yesodForm, yesodStatic, fsnotify
+, yesodCore, yesodDefault, yesodForm, yesodStatic
 }:
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "5.20140707";
-  sha256 = "1m78125w6mq532ngfksrwj3s43qj7wyp756f6qxcqg1cl71xh34k";
+  version = "5.20140709";
+  sha256 = "0n636b52199kj8w3awfvrabg6c76kb133gbfh9r8sp0xrg376z2s";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
     aeson async blazeBuilder bloomfilter byteable caseInsensitive
-    clientsession cryptoApi cryptohash dataDefault dataenc DAV
-    dlist dns editDistance exceptions extensibleExceptions
-    feed filepath gnutls hamlet hS3 hslogger HTTP httpClient
+    clientsession cryptoApi cryptohash dataDefault dataenc DAV dbus
+    dlist dns editDistance exceptions extensibleExceptions fdoNotify
+    feed filepath gnutls hamlet hinotify hS3 hslogger HTTP httpClient
     httpConduit httpTypes IfElse json liftedBase MissingH monadControl
     mtl network networkInfo networkMulticast networkProtocolXmpp
     optparseApplicative QuickCheck random regexTdfa SafeSemaphore
@@ -31,13 +33,19 @@ cabal.mkDerivation (self: {
     tastyRerun text time transformers unixCompat utf8String uuid wai
     waiExtra warp warpTls xmlTypes yesod yesodCore yesodDefault
     yesodForm yesodStatic
-  ] ++ (if (!self.stdenv.isDarwin) then [
-    dbus fdoNotify hinotify
-  ] else [
-    fsnotify
-  ]);
+  ];
   buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
-  configureFlags = "-fAssistant -fProduction";
+  configureFlags = "-fS3
+                    -fWebDAV
+                    -fInotify
+                    -fDbus
+                    -fAssistant
+                    -fWebapp
+                    -fPairing
+                    -fXMPP
+                    -fDNS
+                    -fProduction
+                    -fTDFA";
   preConfigure = ''
     export HOME="$NIX_BUILD_TOP/tmp"
     mkdir "$HOME"
diff --git a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix
index 5395f2dfb6b..f9d43037f6a 100644
--- a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix
@@ -1,18 +1,19 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, extensibleExceptions, filepath, git, github, hslogger
-, IfElse, MissingH, mtl, network, prettyShow, text, unixCompat
+, IfElse, MissingH, mtl, network, optparseApplicative, prettyShow
+, text, unixCompat
 }:
 
 cabal.mkDerivation (self: {
   pname = "github-backup";
-  version = "1.20131203";
-  sha256 = "0156g7zbqsp58g8hniqsilyc79sam7plwhn3w56wbzf8m380mwba";
+  version = "1.20140707";
+  sha256 = "0c15gq91c36xza7yiimqvgk609p9xf9jlzy9683d9p9bx1khpadd";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
     extensibleExceptions filepath github hslogger IfElse MissingH mtl
-    network prettyShow text unixCompat
+    network optparseApplicative prettyShow text unixCompat
   ];
   buildTools = [ git ];
   meta = {
diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix
index c80c8f1c9db..08b85a5530f 100644
--- a/pkgs/applications/window-managers/xmonad/default.nix
+++ b/pkgs/applications/window-managers/xmonad/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, extensibleExceptions, filepath, mtl, utf8String, X11 }:
 
 cabal.mkDerivation (self: {
@@ -14,12 +16,10 @@ cabal.mkDerivation (self: {
     mkdir -p $out/share/man/man1
     mv "$out/"**"/man/"*.1 $out/share/man/man1/
   '';
-
   patches = [
     # Patch to make xmonad use XMONAD_{GHC,XMESSAGE} (if available).
     ./xmonad_ghc_var_0.11.patch
   ];
-
   meta = {
     homepage = "http://xmonad.org";
     description = "A tiling window manager";
diff --git a/pkgs/development/libraries/haskell/HFuse/default.nix b/pkgs/development/libraries/haskell/HFuse/default.nix
index 03ef1f714ee..7ddacbc79ac 100644
--- a/pkgs/development/libraries/haskell/HFuse/default.nix
+++ b/pkgs/development/libraries/haskell/HFuse/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, fuse }:
 
 cabal.mkDerivation (self: {
diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
index 9a43d610f46..d8d4ee2ece1 100644
--- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
+++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HsOpenSSL";
-  version = "0.10.4";
-  sha256 = "1vpidm3jfwlyf61r0g9fks445w4w0kxk3g37fw4slfb1q3xknq2r";
+  version = "0.11";
+  sha256 = "000c1589yf1lzvw32hh2jacq1da6k2vynh5rymw3rlapxq7skyyr";
   buildDepends = [ network time ];
   extraLibraries = [ openssl ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
index 3c2084705cd..9f928bea9de 100644
--- a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
+++ b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "MonadCatchIO-transformers";
-  version = "0.3.1.1";
-  sha256 = "1kfq9py053zic69f25gcsm802dhk7y5k01ipsf2jvl8d4r5iw5kk";
+  version = "0.3.1.2";
+  sha256 = "1r5c4qz6yp1qrsmk9di35d5kk2dcnaxh2mg3n5kdim991ydzsi1d";
   buildDepends = [ extensibleExceptions monadsTf transformers ];
   jailbreak = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/arithmoi/default.nix b/pkgs/development/libraries/haskell/arithmoi/default.nix
index eb8d85f8985..91797435ceb 100644
--- a/pkgs/development/libraries/haskell/arithmoi/default.nix
+++ b/pkgs/development/libraries/haskell/arithmoi/default.nix
@@ -4,9 +4,10 @@
 
 cabal.mkDerivation (self: {
   pname = "arithmoi";
-  version = "0.4.1.0";
-  sha256 = "1xmwxmvl9l1fa2sgr4ff7al8b5d5136h4fq9r05abj3nfnx1a0iq";
+  version = "0.4.1.1";
+  sha256 = "02wrm24dpcsdsjaic30416axad5s4y822si1am4smb2qvrhps9ix";
   buildDepends = [ mtl random ];
+  configureFlags = "-f-llvm";
   jailbreak = true;
   meta = {
     homepage = "https://bitbucket.org/dafis/arithmoi";
diff --git a/pkgs/development/libraries/haskell/aws/default.nix b/pkgs/development/libraries/haskell/aws/default.nix
index a6f138b459c..b50a61f9157 100644
--- a/pkgs/development/libraries/haskell/aws/default.nix
+++ b/pkgs/development/libraries/haskell/aws/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "aws";
-  version = "0.9";
-  sha256 = "07sdz179vqfdcnm6rrdg068xdyqw8m2565bdba5a1s987vdvps21";
+  version = "0.9.1";
+  sha256 = "1fp18j8my9v7d6z0d28bc1hjzrs9znf3c986950pfpv2bsiw7m6d";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/data-fix/default.nix b/pkgs/development/libraries/haskell/data-fix/default.nix
new file mode 100644
index 00000000000..ab029a7d1c9
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-fix/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "data-fix";
+  version = "0.0.1";
+  sha256 = "09r08lrv92ka6p35wkbfhq9ywg7y5pmgszwbz8a20h31vjz1ffpr";
+  meta = {
+    homepage = "https://github.com/anton-k/data-fix";
+    description = "Fixpoint data types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
index b9ff1de60fd..2613899d597 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "digestive-functors-aeson";
-  version = "1.1.9";
-  sha256 = "0lm6byv5vayzg2jp0fqkbi4wkbhvnjw5sl61qnvpa1pqk6p64mrm";
+  version = "1.1.10";
+  sha256 = "0ar165rksnj09sb58qx5hm71kn8gzm936ixmfhf7sqbw2kcbw4nx";
   buildDepends = [ aeson digestiveFunctors lens safe text vector ];
   testDepends = [
     aeson digestiveFunctors HUnit mtl scientific tasty tastyHunit text
diff --git a/pkgs/development/libraries/haskell/djinn/default.nix b/pkgs/development/libraries/haskell/djinn/default.nix
index 6e8a52bb78b..d643b87c42e 100644
--- a/pkgs/development/libraries/haskell/djinn/default.nix
+++ b/pkgs/development/libraries/haskell/djinn/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, haskeline, mtl }:
 
 cabal.mkDerivation (self: {
@@ -7,9 +9,6 @@ cabal.mkDerivation (self: {
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ haskeline mtl ];
-  preConfigure = self.stdenv.lib.optionalString self.stdenv.isDarwin ''
-    sed -i 's/-Wall -optl-Wl/-Wall/' djinn.cabal
-  '';
   meta = {
     homepage = "http://www.augustsson.net/Darcs/Djinn/";
     description = "Generate Haskell code from a type";
diff --git a/pkgs/development/libraries/haskell/encoding/default.nix b/pkgs/development/libraries/haskell/encoding/default.nix
index 82187623b12..5ec0f1502c3 100644
--- a/pkgs/development/libraries/haskell/encoding/default.nix
+++ b/pkgs/development/libraries/haskell/encoding/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "encoding";
-  version = "0.7.0.1";
-  sha256 = "18s6cfcjwjx5dja14rf35rx71cbpr8ylg4x29ffx2blsk8ib9zxh";
+  version = "0.7.0.2";
+  sha256 = "14l3dx7ayvp2dm37c3h7p63zfzmhwpx1hirbkm04idhi3906lxps";
   buildDepends = [
     binary extensibleExceptions HaXml mtl regexCompat
   ];
diff --git a/pkgs/development/libraries/haskell/engine-io-snap/default.nix b/pkgs/development/libraries/haskell/engine-io-snap/default.nix
new file mode 100644
index 00000000000..fdef92cfab8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/engine-io-snap/default.nix
@@ -0,0 +1,18 @@
+{ cabal, attoparsecEnumerator, engineIo, snapCore
+, unorderedContainers, websockets, websocketsSnap
+}:
+
+cabal.mkDerivation (self: {
+  pname = "engine-io-snap";
+  version = "1.0.0";
+  sha256 = "152hz2b9zbmjpp517g6kp7fs7kbvyil28dp6djqjlmp9fqkgckap";
+  buildDepends = [
+    attoparsecEnumerator engineIo snapCore unorderedContainers
+    websockets websocketsSnap
+  ];
+  meta = {
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/engine-io/default.nix b/pkgs/development/libraries/haskell/engine-io/default.nix
new file mode 100644
index 00000000000..fc236cec207
--- /dev/null
+++ b/pkgs/development/libraries/haskell/engine-io/default.nix
@@ -0,0 +1,21 @@
+{ cabal, aeson, async, attoparsec, base64Bytestring, either
+, monadLoops, mwcRandom, stm, text, transformers
+, unorderedContainers, vector, websockets
+}:
+
+cabal.mkDerivation (self: {
+  pname = "engine-io";
+  version = "1.0.0";
+  sha256 = "08gxhf9ihz32z5ayabxw7mn14rib2kyawrvfqzbdkw8vxgjiasv9";
+  buildDepends = [
+    aeson async attoparsec base64Bytestring either monadLoops mwcRandom
+    stm text transformers unorderedContainers vector websockets
+  ];
+  meta = {
+    homepage = "http://github.com/ocharles/engine.io";
+    description = "A Haskell implementation of Engine.IO";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix
index 9b16860b800..09edb8c1214 100644
--- a/pkgs/development/libraries/haskell/esqueleto/default.nix
+++ b/pkgs/development/libraries/haskell/esqueleto/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "esqueleto";
-  version = "1.4.1.3";
-  sha256 = "0n2h1ymyr92a3qaadiff3xxwdxdc8l92kfbag8rh27gi736w28y4";
+  version = "1.4.4";
+  sha256 = "00s52f8l5pbsab83fq8d03xhispyp9mqsh5vvzwiki6kspkj26a0";
   buildDepends = [
     conduit monadLogger persistent resourcet tagged text transformers
     unorderedContainers
diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix
index 2c665c7e065..a7753f1a70d 100644
--- a/pkgs/development/libraries/haskell/fclabels/default.nix
+++ b/pkgs/development/libraries/haskell/fclabels/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fclabels";
-  version = "2.0.1.1";
-  sha256 = "1r798fbdk4xzw649la9disnk1kngy3cmzbi3k8afiy8q6v1fbpwh";
+  version = "2.0.2";
+  sha256 = "108ad6l8ibz44n000hlywqpqslsz1czmsal7qvbd53chmmm4xgdp";
   buildDepends = [ mtl transformers ];
   meta = {
     homepage = "https://github.com/sebastiaanvisser/fclabels";
diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix
index 60f13692c82..99cd863b7c4 100644
--- a/pkgs/development/libraries/haskell/force-layout/default.nix
+++ b/pkgs/development/libraries/haskell/force-layout/default.nix
@@ -9,6 +9,7 @@ cabal.mkDerivation (self: {
   buildDepends = [
     dataDefaultClass lens vectorSpace vectorSpacePoints
   ];
+  jailbreak = true;
   meta = {
     description = "Simple force-directed layout";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
index 38220eeb05e..1df6885280c 100644
--- a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, binary, transformers }:
 
 cabal.mkDerivation (self: {
diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index 5d29ec8474e..d5647089960 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -1,11 +1,13 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, Cabal, convertible, deepseq, doctest, emacs, filepath
 , ghcSybUtils, hlint, hspec, ioChoice, syb, time, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "ghc-mod";
-  version = "4.1.3";
-  sha256 = "0n7nbjbiiphlasqfcxx15fa8axwd9csq2nh3r0wvkrgpsazdlw8c";
+  version = "4.1.5";
+  sha256 = "192v0h9nhi7xgvidyisn3rpr6kjpkibrm2b859b6a92gp0h37nnn";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -21,13 +23,11 @@ cabal.mkDerivation (self: {
   configureFlags = "--datasubdir=${self.pname}-${self.version}";
   postInstall = ''
     cd $out/share/$pname-$version
-    sed -i -e 's/"-b" "\\n" "-l"/"-l" "-b" "\\"\\\\n\\""/' ghc-process.el
     make
     rm Makefile
     cd ..
     mkdir -p "$out/share/emacs"
     mv $pname-$version emacs/site-lisp
-
     mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped
     cat - > $out/bin/ghc-mod <<EOF
     #! ${self.stdenv.shell}
@@ -36,15 +36,6 @@ cabal.mkDerivation (self: {
     eval exec $out/bin/.ghc-mod-wrapped \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
     EOF
     chmod +x $out/bin/ghc-mod
-
-    mv $out/bin/ghc-modi $out/bin/.ghc-modi-wrapped
-    cat - > $out/bin/ghc-modi <<EOF
-    #! ${self.stdenv.shell}
-    COMMAND=\$1
-    shift
-    eval exec $out/bin/.ghc-modi-wrapped \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
-    EOF
-    chmod +x $out/bin/ghc-modi
   '';
   meta = {
     homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
diff --git a/pkgs/development/libraries/haskell/ghc-paths/default.nix b/pkgs/development/libraries/haskell/ghc-paths/default.nix
index b930e993dcc..0a2b7dc18f3 100644
--- a/pkgs/development/libraries/haskell/ghc-paths/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-paths/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal }:
 
 cabal.mkDerivation (self: {
diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix
index d8edd81cda6..2a4badd91e3 100644
--- a/pkgs/development/libraries/haskell/ghc-vis/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, cairo, deepseq, fgl, ghcHeapView, graphviz, gtk, mtl
 , svgcairo, text, transformers, xdot
 }:
diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
index 9bec0bacb34..e0a0053b2ea 100644
--- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
+++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gtk2hs-buildtools";
-  version = "0.12.5.2";
-  sha256 = "1w4mfwkiqil9xd1xl4himb6vnl66hxb7a4vch6wh3bfad880qyiw";
+  version = "0.13.0.0";
+  sha256 = "075f6jjkk56h0nda0gbdr775d72c0b3d2z483cff2bnnjf8aqwa6";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ filepath hashtables random ];
diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix
index cfaabe7f6b0..02032c21120 100644
--- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix
+++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, happy, syb }:
 
 cabal.mkDerivation (self: {
diff --git a/pkgs/development/libraries/haskell/haskell-token-utils/default.nix b/pkgs/development/libraries/haskell/haskell-token-utils/default.nix
index 27eaaee2d31..27e9eae783f 100644
--- a/pkgs/development/libraries/haskell/haskell-token-utils/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-token-utils/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskell-token-utils";
-  version = "0.0.0.2";
-  sha256 = "115lqddhjra3wjnj5n8gpm0iawf6m1l2ggjh2n8nbx6wjraghrrv";
+  version = "0.0.0.3";
+  sha256 = "1qfb0gzi8mvraflk7l8wckkaa2gfdq5wqk7ax3v4i4f1mrd7zr4f";
   buildDepends = [
     dualTree ghcSybUtils haskellSrcExts monoidExtras mtl rosezipper
     semigroups syb
diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix
index e4d7e71848d..a9dc3064a23 100644
--- a/pkgs/development/libraries/haskell/hjsmin/default.nix
+++ b/pkgs/development/libraries/haskell/hjsmin/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hjsmin";
-  version = "0.1.4.6";
-  sha256 = "0z0wzgwm66ckq9h756s7srfyiv2jia9779yi86cn1zgzr8dwspvr";
+  version = "0.1.4.7";
+  sha256 = "1gw9is6piqrqxnrwp8v3vij90icmym58rxqnnklrcjfi3ai7y58f";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/holy-project/default.nix b/pkgs/development/libraries/haskell/holy-project/default.nix
index 4e751d9c003..09141bf6d0a 100644
--- a/pkgs/development/libraries/haskell/holy-project/default.nix
+++ b/pkgs/development/libraries/haskell/holy-project/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, aeson, ansiTerminal, Cabal, filepath, hastache
 , httpConduit, HUnit, lens, QuickCheck, random, smallcheck, split
 , syb, tasty, tastyHunit, tastyQuickcheck, tastySmallcheck, text
diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix
index 5932cd2cc98..5da81ff1127 100644
--- a/pkgs/development/libraries/haskell/hoogle/default.nix
+++ b/pkgs/development/libraries/haskell/hoogle/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hoogle";
-  version = "4.2.33";
-  sha256 = "0jwik79qcflaghqxfvsd8xvb7y1czb1xihg1ijd29lx7p5mz03il";
+  version = "4.2.34";
+  sha256 = "0vldc7s3nq70jxmnxdzlfrlwg0pxw0lq1lcd53klj2ksjkqhm5jg";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/hspec-expectations/default.nix b/pkgs/development/libraries/haskell/hspec-expectations/default.nix
index 1f23c1d4e94..313d1a01f02 100644
--- a/pkgs/development/libraries/haskell/hspec-expectations/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-expectations/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec-expectations";
-  version = "0.5.0.1";
-  sha256 = "0r1yy94q30gp3wyif7qfa22gn3g2lrszwygsy4wknc396fab7mvj";
+  version = "0.6.0";
+  sha256 = "01l9mnny5pgaqqswv1hyq1v77yd4vx9bfyz6662iypc0fz78519i";
   buildDepends = [ HUnit ];
   testDepends = [ hspec HUnit markdownUnlit silently ];
   doCheck = false;
diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix
index 8108eab09a0..c665bf2f272 100644
--- a/pkgs/development/libraries/haskell/hspec/default.nix
+++ b/pkgs/development/libraries/haskell/hspec/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec";
-  version = "1.10.0";
-  sha256 = "0lqc4sxl2c1rgnmp4a2fikc78f9caxswkmxfi8wajxlwaj58sy8p";
+  version = "1.10.0.1";
+  sha256 = "1i0pl67jplvqh370x6mzdb86a653k1a1l8bjac60izr8d22n35rl";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/imm/default.nix b/pkgs/development/libraries/haskell/imm/default.nix
index 38bc9bbfde7..0588e633d90 100644
--- a/pkgs/development/libraries/haskell/imm/default.nix
+++ b/pkgs/development/libraries/haskell/imm/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, async, caseInsensitive, cond, dataDefault, dyre, feed
 , filepath, hslogger, httpConduit, httpTypes, lens, mimeMail
 , monadControl, mtl, network, opml, random, resourcet, text
@@ -9,7 +11,6 @@ cabal.mkDerivation (self: {
   pname = "imm";
   version = "0.6.0.1";
   sha256 = "11m6937wafl6nic69mbibrjnxib503907y21n9zmsxc8vnjl3pps";
-  patches = [ ./latest-feed-http-conduit-tls.patch ];
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -24,4 +25,4 @@ cabal.mkDerivation (self: {
     platforms = self.ghc.meta.platforms;
     maintainers = [ "Daniel Bergey <bergey@teallabs.org>" ];
   };
-})
\ No newline at end of file
+})
diff --git a/pkgs/development/libraries/haskell/imm/latest-feed-http-conduit-tls.patch b/pkgs/development/libraries/haskell/imm/latest-feed-http-conduit-tls.patch
deleted file mode 100644
index afe72bc83e7..00000000000
--- a/pkgs/development/libraries/haskell/imm/latest-feed-http-conduit-tls.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-# HG changeset patch
-# User Daniel Bergey <bergey@alum.mit.edu>
-# Date 1398284724 0
-#      Wed Apr 23 20:25:24 2014 +0000
-# Node ID 4cc692e7acc4f21ffab9e5572d286495791d22d1
-# Parent  31e3ba1aaaf9efdce66e8ef5c192d0f4214150f4
-Update for feed-0.3.9.2, http-conduit-2.0, tls-1.2
-
-diff -r 31e3ba1aaaf9 -r 4cc692e7acc4 Imm/Error.hs
---- a/Imm/Error.hs	Sun Jun 16 12:23:40 2013 +0200
-+++ b/Imm/Error.hs	Wed Apr 23 20:25:24 2014 +0000
-@@ -41,7 +41,7 @@
- data ImmError =
-     OtherError         String
-   | HTTPError          HttpException
--  | TLSError           HandshakeFailed
-+  | TLSError           TLSException
-   | UnicodeError       UnicodeException
-   | ParseUriError      String
-   | ParseTimeError     String
-@@ -63,7 +63,7 @@
-         "/!\\ Cannot parse date from item: ",
-         "    title: "       ++ (show $ getItemTitle item),
-         "    link:"         ++ (show $ getItemLink item),
--        "    publish date:" ++ (show $ getItemPublishDate item),
-+        "    publish date:" ++ (show (getItemPublishDate item :: Maybe (Maybe UTCTime))),
-         "    date:"         ++ (show $ getItemDate item)]
-     show (ParseTimeError raw)      = "/!\\ Cannot parse time: " ++ raw
-     show (ParseFeedError raw)      = "/!\\ Cannot parse feed: " ++ raw
-diff -r 31e3ba1aaaf9 -r 4cc692e7acc4 Imm/HTTP.hs
---- a/Imm/HTTP.hs	Sun Jun 16 12:23:40 2013 +0200
-+++ b/Imm/HTTP.hs	Wed Apr 23 20:25:24 2014 +0000
-@@ -50,13 +50,13 @@
-     either throwError return res
- 
- -- | Monad-agnostic version of 'parseUrl'
--parseURL :: (MonadBase IO m, MonadError ImmError m) => String -> m (Request m')
-+parseURL :: (MonadBase IO m, MonadError ImmError m) => String -> m Request
- parseURL uri = do
-     result <- io $ (Right <$> parseUrl uri) `catch` (return . Left . HTTPError)
-     either throwError return result
- 
- -- | Build an HTTP request for given URI
--request :: (MonadBase IO m, MonadError ImmError m) => String -> m (Request a)
-+request :: (MonadBase IO m, MonadError ImmError m) => String -> m Request
- request uri = do
-     req <- parseURL uri
-     return $ req { requestHeaders = [
-diff -r 31e3ba1aaaf9 -r 4cc692e7acc4 imm.cabal
---- a/imm.cabal	Sun Jun 16 12:23:40 2013 +0200
-+++ b/imm.cabal	Wed Apr 23 20:25:24 2014 +0000
-@@ -46,10 +46,10 @@
-         data-default,
-         directory,
-         dyre,
--        feed,
-+        feed == 0.3.9.2,
-         filepath,
-         hslogger,
--        http-conduit >= 1.9.0,
-+        http-conduit >= 2.0 && < 2.2,
-         http-types,
-         lens,
-         mime-mail,
-@@ -66,7 +66,7 @@
-         transformers,
-         time,
-         timerep >= 1.0.3,
--        tls,
-+        tls >= 1.2 && < 1.3,
-         utf8-string,
-         xdg-basedir,
-         xml
diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
index eb4e7e258af..9b769d41ab5 100644
--- a/pkgs/development/libraries/haskell/lens/default.nix
+++ b/pkgs/development/libraries/haskell/lens/default.nix
@@ -12,8 +12,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lens";
-  version = "4.2";
-  sha256 = "0aqhr8akb7wg270jxi1ns3mrpv42cfssi3g2kzyhkjmb39qxpp2w";
+  version = "4.3";
+  sha256 = "0wvsf0vkqjmmgl3p5lxbypn4p126l927ip7l2iisqzwyk87zfqqy";
   buildDepends = [
     aeson attoparsec bifunctors comonad contravariant distributive
     exceptions filepath free hashable mtl parallel primitive
diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix
index 4d8e4065bce..73685698f5e 100644
--- a/pkgs/development/libraries/haskell/mono-traversable/default.nix
+++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mono-traversable";
-  version = "0.6.0.3";
-  sha256 = "1zg8hig4wgbiswb0sppjiga1r6sw7fjkxfiwlck4bwvghpyr5bp3";
+  version = "0.6.0.4";
+  sha256 = "1svqxc96n2andxcgrv8s29hkq6nw1qigv5p0dw9vx2ynk68pfhww";
   buildDepends = [
     comonad dlist dlistInstances hashable semigroupoids semigroups text
     transformers unorderedContainers vector vectorAlgorithms
diff --git a/pkgs/development/libraries/haskell/ncurses/default.nix b/pkgs/development/libraries/haskell/ncurses/default.nix
index 2b566f79a98..7e9ac0ddd95 100644
--- a/pkgs/development/libraries/haskell/ncurses/default.nix
+++ b/pkgs/development/libraries/haskell/ncurses/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, c2hs, ncurses, text, transformers }:
 
 cabal.mkDerivation (self: {
diff --git a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix
index 728a40d8d3e..b4a70eb6843 100644
--- a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix
+++ b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, dataAccessor, network, networkTransport
 , networkTransportTests
 }:
diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix
index e7da848e4b2..b58df3be314 100644
--- a/pkgs/development/libraries/haskell/oeis/default.nix
+++ b/pkgs/development/libraries/haskell/oeis/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, HTTP, HUnit, network, testFramework, testFrameworkHunit }:
 
 cabal.mkDerivation (self: {
diff --git a/pkgs/development/libraries/haskell/pipes-aeson/default.nix b/pkgs/development/libraries/haskell/pipes-aeson/default.nix
index 03cbf2be926..96044afae0e 100644
--- a/pkgs/development/libraries/haskell/pipes-aeson/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-aeson/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-aeson";
-  version = "0.4.1";
-  sha256 = "06fxl4az5brbivc5db498fc3yawrc2rwnrn20rbssihd0lp9xm1i";
+  version = "0.4.1.1";
+  sha256 = "1z520c9l2wqjcv5lb997n3zfks7p0z7dlwgqm74dcwnnfy3mfp9j";
   buildDepends = [
     aeson attoparsec pipes pipesAttoparsec pipesBytestring pipesParse
     transformers
diff --git a/pkgs/development/libraries/haskell/pipes-group/default.nix b/pkgs/development/libraries/haskell/pipes-group/default.nix
index d8f314989e0..584713352ba 100644
--- a/pkgs/development/libraries/haskell/pipes-group/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-group/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-group";
-  version = "1.0.0";
-  sha256 = "1izc2z3cwz7dihhfrngjyiaxmcpp794ragbl6v17y8c2pj0s34kh";
+  version = "1.0.1";
+  sha256 = "19caih65hsvnvkwv8dlrrf961aw6k0zr9yx78cia1padslidxlbw";
   buildDepends = [ free pipes pipesParse transformers ];
   meta = {
     description = "Group streams into substreams";
diff --git a/pkgs/development/libraries/haskell/pipes-zlib/default.nix b/pkgs/development/libraries/haskell/pipes-zlib/default.nix
index 30a00d3ba16..5b471fd55a3 100644
--- a/pkgs/development/libraries/haskell/pipes-zlib/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-zlib/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-zlib";
-  version = "0.4.0";
-  sha256 = "1xi8x7cfzr7042x5jq8b6xqdhffh1jgprk90yzsfjldllck9z5ia";
+  version = "0.4.0.1";
+  sha256 = "1k91q5hci4hk2kzaqfvg1nwbklqyg83wwhm3sdfhdn2famj0mls0";
   buildDepends = [ pipes transformers zlib zlibBindings ];
   meta = {
     homepage = "https://github.com/k0001/pipes-zlib";
diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
index ed678ca514c..58b6948dd98 100644
--- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "postgresql-simple";
-  version = "0.4.2.3";
-  sha256 = "1rg6virvz4nr0m39sr72h23yks5f8ih9nimgacx30zw7xvnx942p";
+  version = "0.4.3.0";
+  sha256 = "16i1qzshbscnbjb4rxz5hl1iaxjmsc21878prj5pp33zbm53dlcm";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeTextual hashable postgresqlLibpq
     scientific text time transformers uuid vector
diff --git a/pkgs/development/libraries/haskell/readline/default.nix b/pkgs/development/libraries/haskell/readline/default.nix
index 6090fc8578a..9a05fed7e12 100644
--- a/pkgs/development/libraries/haskell/readline/default.nix
+++ b/pkgs/development/libraries/haskell/readline/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, readline, ncurses }:
 
 cabal.mkDerivation (self: {
diff --git a/pkgs/development/libraries/haskell/safe/default.nix b/pkgs/development/libraries/haskell/safe/default.nix
index f3f19907699..f6eaed8f3b5 100644
--- a/pkgs/development/libraries/haskell/safe/default.nix
+++ b/pkgs/development/libraries/haskell/safe/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "safe";
-  version = "0.3.5";
-  sha256 = "0xv409ps1h1b28v8rkg59a09z001nmpvqvwf3mdkzkyzmxfgq30j";
+  version = "0.3.6";
+  sha256 = "03fjasjw8mh8c15xg8dncdn9g8scr427889vchcckilll40kvzvm";
   meta = {
     homepage = "http://community.haskell.org/~ndm/safe/";
     description = "Library of safe (exception free) functions";
diff --git a/pkgs/development/libraries/haskell/scientific/0.3.2.1.nix b/pkgs/development/libraries/haskell/scientific/0.3.3.0.nix
index 63e0f606824..c2563259ce0 100644
--- a/pkgs/development/libraries/haskell/scientific/0.3.2.1.nix
+++ b/pkgs/development/libraries/haskell/scientific/0.3.3.0.nix
@@ -1,16 +1,16 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, deepseq, hashable, QuickCheck, smallcheck, tasty
-, tastyAntXml, tastyQuickcheck, tastySmallcheck, text
+, tastyAntXml, tastyHunit, tastyQuickcheck, tastySmallcheck, text
 }:
 
 cabal.mkDerivation (self: {
   pname = "scientific";
-  version = "0.3.2.1";
-  sha256 = "0z0k0dqmv6a3spgl48yl00a55niv0gqjy906sh4r8xfpsabzl88s";
+  version = "0.3.3.0";
+  sha256 = "1kj49ibq53m7cfs9pq396l4fbqnarqzay7a65rmsrzi2vz15parv";
   buildDepends = [ deepseq hashable text ];
   testDepends = [
-    QuickCheck smallcheck tasty tastyAntXml tastyQuickcheck
+    QuickCheck smallcheck tasty tastyAntXml tastyHunit tastyQuickcheck
     tastySmallcheck text
   ];
   jailbreak = true;
diff --git a/pkgs/development/libraries/haskell/shellish/default.nix b/pkgs/development/libraries/haskell/shellish/default.nix
new file mode 100644
index 00000000000..cdf2e3a3463
--- /dev/null
+++ b/pkgs/development/libraries/haskell/shellish/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, filepath, mtl, strict, time, unixCompat }:
+
+cabal.mkDerivation (self: {
+  pname = "shellish";
+  version = "0.1.4";
+  sha256 = "1ldwid270mwyky6zmggbvn72hvs4s39hhf2zj8r0jahxnwlpbfan";
+  buildDepends = [ filepath mtl strict time unixCompat ];
+  meta = {
+    homepage = "http://repos.mornfall.net/shellish";
+    description = "shell-/perl- like (systems) programming in Haskell";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/singletons/default.nix b/pkgs/development/libraries/haskell/singletons/default.nix
index aeace4d3fce..c4074b9d62c 100644
--- a/pkgs/development/libraries/haskell/singletons/default.nix
+++ b/pkgs/development/libraries/haskell/singletons/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, Cabal, constraints, filepath, mtl, tasty, tastyGolden
 , thDesugar
 }:
diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix
index 6fd1eaf7314..d2278f329f4 100644
--- a/pkgs/development/libraries/haskell/snap/server.nix
+++ b/pkgs/development/libraries/haskell/snap/server.nix
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     network snapCore text time unixCompat
   ];
   configureFlags = "-fopenssl";
+  patchPhase = ''
+    sed -i -e 's|HsOpenSSL >= .*|HsOpenSSL|' snap-server.cabal
+  '';
   meta = {
     homepage = "http://snapframework.com/";
     description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework";
diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix
index f89a0607da9..189750bd446 100644
--- a/pkgs/development/libraries/haskell/snap/snap.nix
+++ b/pkgs/development/libraries/haskell/snap/snap.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, aeson, attoparsec, cereal, clientsession, comonad
 , configurator, directoryTree, dlist, errors, filepath, hashable
 , heist, lens, logict, MonadCatchIOTransformers, mtl, mwcRandom
diff --git a/pkgs/development/libraries/haskell/socket-io/default.nix b/pkgs/development/libraries/haskell/socket-io/default.nix
new file mode 100644
index 00000000000..65179c1dbaf
--- /dev/null
+++ b/pkgs/development/libraries/haskell/socket-io/default.nix
@@ -0,0 +1,18 @@
+{ cabal, aeson, attoparsec, engineIo, mtl, stm, text, transformers
+, unorderedContainers, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "socket-io";
+  version = "1.0.0";
+  sha256 = "1xvj2x6nr14wna0plivzbzkca2y4xw6bxhvc5mqjh664197r9jsx";
+  buildDepends = [
+    aeson attoparsec engineIo mtl stm text transformers
+    unorderedContainers vector
+  ];
+  meta = {
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/sparse/default.nix b/pkgs/development/libraries/haskell/sparse/default.nix
index f498da21939..c2fbf368f53 100644
--- a/pkgs/development/libraries/haskell/sparse/default.nix
+++ b/pkgs/development/libraries/haskell/sparse/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, contravariant, deepseq, doctest, filepath, hlint
 , hybridVectors, lens, linear, mtl, primitive, QuickCheck
 , semigroups, simpleReflect, testFramework
diff --git a/pkgs/development/libraries/haskell/streaming-commons/default.nix b/pkgs/development/libraries/haskell/streaming-commons/default.nix
index 6aff1d21317..763476dd1c0 100644
--- a/pkgs/development/libraries/haskell/streaming-commons/default.nix
+++ b/pkgs/development/libraries/haskell/streaming-commons/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "streaming-commons";
-  version = "0.1.3";
-  sha256 = "0zv309lqmv5bgbmxx5k0zk4iyxwj77lwqcaaycizi7559nzvsrh3";
+  version = "0.1.3.1";
+  sha256 = "0ryj9pp681f1pqvcyy5ci2zng6ax93j5navm886k095wxmamhzmf";
   buildDepends = [
     blazeBuilder network random text transformers zlib
   ];
diff --git a/pkgs/development/libraries/haskell/th-desugar/default.nix b/pkgs/development/libraries/haskell/th-desugar/default.nix
index 5efddd3e9d3..c6493736001 100644
--- a/pkgs/development/libraries/haskell/th-desugar/default.nix
+++ b/pkgs/development/libraries/haskell/th-desugar/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "th-desugar";
-  version = "1.4.1";
-  sha256 = "1pjv301bshdmn3s5nrmmcx5d1b80c410lml73sai68dhx7v64vw2";
+  version = "1.4.2";
+  sha256 = "16l0khjx2wppnm9spp6mg659m95hxjkzfv3pjw5ays3z6clhx8b9";
   buildDepends = [ mtl syb ];
   testDepends = [ hspec HUnit mtl syb ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix
index 4a07dc1d5c6..b646fe4d155 100644
--- a/pkgs/development/libraries/haskell/thyme/default.nix
+++ b/pkgs/development/libraries/haskell/thyme/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "thyme";
-  version = "0.3.5.1";
-  sha256 = "0v3aq7zv4fnkjhfc7mm6vx2wb5dh2npf2lsgpvcrdpy5zlfsrx50";
+  version = "0.3.5.2";
+  sha256 = "1vb5qn9m88y9738d9znim5lprb8z10am5yjaksdjl151li8apd6x";
   buildDepends = [
     aeson attoparsec deepseq mtl profunctors QuickCheck random text
     time vector vectorSpace vectorThUnbox
diff --git a/pkgs/development/libraries/haskell/tz/default.nix b/pkgs/development/libraries/haskell/tz/default.nix
index 95cd928a99e..ead6e4f5558 100644
--- a/pkgs/development/libraries/haskell/tz/default.nix
+++ b/pkgs/development/libraries/haskell/tz/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, binary, bindingsPosix, deepseq, HUnit, pkgs_tzdata
 , QuickCheck, testFramework, testFrameworkHunit
 , testFrameworkQuickcheck2, testFrameworkTh, time, tzdata, vector
diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.5.0.nix b/pkgs/development/libraries/haskell/unordered-containers/0.2.5.0.nix
new file mode 100644
index 00000000000..70f00b68d42
--- /dev/null
+++ b/pkgs/development/libraries/haskell/unordered-containers/0.2.5.0.nix
@@ -0,0 +1,23 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, ChasingBottoms, deepseq, hashable, HUnit, QuickCheck
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
+}:
+
+cabal.mkDerivation (self: {
+  pname = "unordered-containers";
+  version = "0.2.5.0";
+  sha256 = "0y85a9zg77h05c5ajchvfazg84ksvyi92r6bbmh09qzlf7mlb4bj";
+  buildDepends = [ deepseq hashable ];
+  testDepends = [
+    ChasingBottoms hashable HUnit QuickCheck testFramework
+    testFrameworkHunit testFrameworkQuickcheck2
+  ];
+  doCheck = false;
+  meta = {
+    homepage = "https://github.com/tibbe/unordered-containers";
+    description = "Efficient hashing-based container types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/utf8-string/default.nix b/pkgs/development/libraries/haskell/utf8-string/default.nix
index 1233ce8806d..405dbecb6ba 100644
--- a/pkgs/development/libraries/haskell/utf8-string/default.nix
+++ b/pkgs/development/libraries/haskell/utf8-string/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal }:
 
 cabal.mkDerivation (self: {
diff --git a/pkgs/development/libraries/haskell/vector-algorithms/default.nix b/pkgs/development/libraries/haskell/vector-algorithms/default.nix
index 02dd96dd6ce..00258e7f3f6 100644
--- a/pkgs/development/libraries/haskell/vector-algorithms/default.nix
+++ b/pkgs/development/libraries/haskell/vector-algorithms/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vector-algorithms";
-  version = "0.6.0.1";
-  sha256 = "0dkiz0c5dmc3a15zz5pxv4rz4n0bw5irb5a148gccfrg5c80vzc5";
+  version = "0.6.0.2";
+  sha256 = "1gn2pvgvm9g0dajx2wv305fxwhkpdj9pybrwrm3j2frl4dnj7dcq";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ mtl mwcRandom primitive vector ];
diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index e7100fb20f9..76094cd0c0e 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "3.0.0.1";
-  sha256 = "0i28d3pwz2fskg94xlkapdw07zkq3acnqk21kpgm5ffbj6qvbvsg";
+  version = "3.0.1";
+  sha256 = "1k6d9p93r7r95i5yi7mvhix94qigkzanqjq5qa6k7qfpnjj727id";
   buildDepends = [
     ansiTerminal base64Bytestring blazeBuilder caseInsensitive
     dataDefaultClass deepseq fastLogger httpTypes liftedBase network
diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index 0abb8a65f6c..3065c52c0f9 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "3.0.0.3";
-  sha256 = "0lhmhgbza49lkbay6ydj5h1g04qzs4jx2wyq4bhddjrpmxsdsy2y";
+  version = "3.0.0.4";
+  sha256 = "119yw4k11v2gq3z4gjr51i8z551cbbgwhkfnl9jr4ira06m6si2v";
   buildDepends = [
     blazeBuilder caseInsensitive hashable httpDate httpTypes network
     simpleSendfile streamingCommons text unixCompat void wai
diff --git a/pkgs/development/libraries/haskell/word8/default.nix b/pkgs/development/libraries/haskell/word8/default.nix
index 62bb4073651..7ffbbf7cba7 100644
--- a/pkgs/development/libraries/haskell/word8/default.nix
+++ b/pkgs/development/libraries/haskell/word8/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "word8";
-  version = "0.0.4";
-  sha256 = "1jrys2crl1yfkgwc4ny6x1kr24kx8j3zsy0zql5ms19rfb0rnkki";
+  version = "0.1.0";
+  sha256 = "1729ip83wyw8w3v8mzmazaw5b9l81zg95hrkmfq3qjk5gz1s75s0";
   testDepends = [ hspec ];
   meta = {
     description = "Word8 library";
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
index 90bfdc5ca0a..c10897b4b11 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, stm, wxcore }:
 
 cabal.mkDerivation (self: {
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
index b816c3007f9..4026a892f6e 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, libX11, mesa, wxdirect, wxGTK }:
 
 cabal.mkDerivation (self: {
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
index d404099bf53..8fc4df1a0ce 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, filepath, libX11, mesa, parsec, stm, time, wxc, wxdirect
 , wxGTK
 }:
diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
index b876ebed4e8..f46361a1451 100644
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xml-conduit";
-  version = "1.2.0.2";
-  sha256 = "1kcrhyri4knkp1x9zn99qklkj4nd47gwdfy6q0pwdz7cgjskps1z";
+  version = "1.2.0.3";
+  sha256 = "0bb4nc9nwq4z6vdsiqs0zk8k8yvmyxdrya5fz2h8z8ng66xaq4k1";
   buildDepends = [
     attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
     blazeHtml blazeMarkup conduit conduitExtra dataDefault deepseq
diff --git a/pkgs/development/libraries/haskell/xml-hamlet/default.nix b/pkgs/development/libraries/haskell/xml-hamlet/default.nix
index 438bb19c04a..e1c0c862078 100644
--- a/pkgs/development/libraries/haskell/xml-hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/xml-hamlet/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xml-hamlet";
-  version = "0.4.0.8";
-  sha256 = "10hc4a6lqifiinm9rf1ziw35bjnjgkd5mhagg9anvz35hhr7bbrr";
+  version = "0.4.0.9";
+  sha256 = "0vm4jhvjf53a33sisnhghg0m9pcv2fx676rl90vbm2xcd9rqlj82";
   buildDepends = [ parsec shakespeare text xmlConduit ];
   testDepends = [ hspec HUnit parsec shakespeare text xmlConduit ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index 5f4a04e66a5..d43100901cc 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -2,21 +2,22 @@
 
 { cabal, aeson, blazeHtml, blazeMarkup, conduitExtra, dataDefault
 , fastLogger, hamlet, monadControl, monadLogger, networkConduit
-, safe, shakespeare, shakespeareCss, shakespeareJs, text
-, transformers, unorderedContainers, wai, waiExtra, warp, yaml
-, yesodAuth, yesodCore, yesodForm, yesodPersistent
+, safe, shakespeare, shakespeareCss, shakespeareJs
+, streamingCommons, text, transformers, unorderedContainers, wai
+, waiExtra, warp, yaml, yesodAuth, yesodCore, yesodForm
+, yesodPersistent
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod";
-  version = "1.2.6";
-  sha256 = "0rw46zznczdzg2wvbgp5kpq3yrl6w40vbbs7zyvqpcf6m82jsfz0";
+  version = "1.2.6.1";
+  sha256 = "1xiqpbcjxisc4lic7ls03rz184d95vkh4kb3ampwbx463qbj9im2";
   buildDepends = [
     aeson blazeHtml blazeMarkup conduitExtra dataDefault fastLogger
     hamlet monadControl monadLogger networkConduit safe shakespeare
-    shakespeareCss shakespeareJs text transformers unorderedContainers
-    wai waiExtra warp yaml yesodAuth yesodCore yesodForm
-    yesodPersistent
+    shakespeareCss shakespeareJs streamingCommons text transformers
+    unorderedContainers wai waiExtra warp yaml yesodAuth yesodCore
+    yesodForm yesodPersistent
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";
diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix
index 4be166f9768..06c04ca41b5 100644
--- a/pkgs/development/tools/analysis/spin/default.nix
+++ b/pkgs/development/tools/analysis/spin/default.nix
@@ -1,26 +1,20 @@
-{stdenv, fetchurl, flex, yacc, tk }:
+{stdenv, fetchurl, yacc }:
 
-stdenv.mkDerivation {
-  name = "spin-5.1.7";
+stdenv.mkDerivation rec {
+  version = "6.3.2";
+  name = "spin-${version}";
 
   src = fetchurl {
-    url = http://spinroot.com/spin/Src/spin517.tar.gz;
-    sha256 = "03c6bmar4z13jx7dddb029f0qnmgl8x4hyfwn3qijjyd4dbliiw6";
+    url = http://spinroot.com/spin/Src/spin632.tar.gz;
+    curlOpts = "--user-agent 'Mozilla/5.0'";
+    sha256 = "1llsv1mnwr99hvsm052i3wwpa3dm5j12s5p10hizi6i9hlp00b5y";
   };
 
-  buildInputs = [ flex yacc tk ];
+  buildInputs = [ yacc ];
 
-  patchPhase = ''
-    cd Src*
-    sed -i -e 's/-DNXT/-DNXT -DCPP="\\"gcc -E -x c\\""/' makefile
-  '';
-  installPhase = ''
-    mkdir -p $out/bin
-    cp ../Xspin*/xsp* $out/bin/xspin
-    sed -i -e '1s@^#!/bin/sh@#!${tk}/bin/wish@' \
-      -e '/exec wish/d' $out/bin/xspin
-    cp spin $out/bin
-  '';
+  sourceRoot = "Spin/Src${version}";
+
+  installPhase = "install -D spin $out/bin/spin";
 
   meta = {
     description = "Formal verification tool for distributed software systems";
diff --git a/pkgs/development/tools/haskell/cabal-bounds/default.nix b/pkgs/development/tools/haskell/cabal-bounds/default.nix
index a27fa1dc689..44d4bcd8340 100644
--- a/pkgs/development/tools/haskell/cabal-bounds/default.nix
+++ b/pkgs/development/tools/haskell/cabal-bounds/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal-bounds";
-  version = "0.6";
-  sha256 = "0dl8rf8y365a20yz5kk1c9y860k5mkg1jp5dipvbf451h7a7h9w5";
+  version = "0.7";
+  sha256 = "1dz3bi33s2s0glsw248dxh76yj6qqlq2v2z7rys5js1mi6dicwa3";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index 8af527c814f..4115c8621f9 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal2nix";
-  version = "1.64";
-  sha256 = "0fcw8z3rmn2c44879a7fsfb5pz0digkrqnqhbf46ndl432wzj21p";
+  version = "1.65";
+  sha256 = "13x1kikwdlx1xlgy1bxlnn0bgbzj3khxm2x59584a8h2kp9kw9qm";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];
diff --git a/pkgs/development/tools/misc/ShellCheck/default.nix b/pkgs/development/tools/misc/ShellCheck/default.nix
index ec62d9fbed4..8beca12325b 100644
--- a/pkgs/development/tools/misc/ShellCheck/default.nix
+++ b/pkgs/development/tools/misc/ShellCheck/default.nix
@@ -1,14 +1,15 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, json, mtl, parsec, regexCompat }:
+{ cabal, json, mtl, parsec, QuickCheck, regexCompat }:
 
 cabal.mkDerivation (self: {
   pname = "ShellCheck";
-  version = "0.3.3";
-  sha256 = "15lmc7cbi6s852qhd6h9asgz7ss1khfhq7wj4sgblr5mgppldg93";
+  version = "0.3.4";
+  sha256 = "07fw8c33p7h1kvg899dwnvqpxpywcidhbw9jhjd8xsma7kz471iw";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ json mtl parsec regexCompat ];
+  buildDepends = [ json mtl parsec QuickCheck regexCompat ];
+  testDepends = [ json mtl parsec QuickCheck regexCompat ];
   meta = {
     homepage = "http://www.shellcheck.net/";
     description = "Shell script analysis tool";
diff --git a/pkgs/development/tools/parsing/happy/1.18.8.nix b/pkgs/development/tools/parsing/happy/1.18.8.nix
deleted file mode 100644
index 141205d1940..00000000000
--- a/pkgs/development/tools/parsing/happy/1.18.8.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ cabal, mtl, perl }:
-
-cabal.mkDerivation (self: {
-  pname = "happy";
-  version = "1.18.8";
-  sha256 = "1mqdawxszmdk71fbl8ljxz7jyhai00sflaw0gahp039n44mrspam";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ mtl ];
-  buildTools = [ perl ];
-  patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ];
-  meta = {
-    homepage = "http://www.haskell.org/happy/";
-    description = "Happy is a parser generator for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/tools/parsing/happy/1.19.2.nix b/pkgs/development/tools/parsing/happy/1.19.2.nix
deleted file mode 100644
index 4173d6d6c11..00000000000
--- a/pkgs/development/tools/parsing/happy/1.19.2.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ cabal, mtl, perl }:
-
-cabal.mkDerivation (self: {
-  pname = "happy";
-  version = "1.19.2";
-  sha256 = "1m74dz83fs7gbcr040nhfx1xw3smjk24g5cp6a0wxvrmlh12yc66";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ mtl ];
-  buildTools = [ perl ];
-  patchPhase = "sed -i -e '/^import Data.Monoid/d' Setup.lhs";
-  meta = {
-    homepage = "http://www.haskell.org/happy/";
-    description = "Happy is a parser generator for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/tools/parsing/happy/1.19.3.nix b/pkgs/development/tools/parsing/happy/1.19.3.nix
deleted file mode 100644
index c43806cd2df..00000000000
--- a/pkgs/development/tools/parsing/happy/1.19.3.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ cabal, mtl, perl }:
-
-cabal.mkDerivation (self: {
-  pname = "happy";
-  version = "1.19.3";
-  sha256 = "1q3hipgcwvrf333wlyqmg4mgf24gwiagddlfyr9zgi4k42p2373x";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ mtl ];
-  buildTools = [ perl ];
-  preConfigure = self.stdenv.lib.optional (self.stdenv.lib.versionOlder "7.9" self.ghc.version) ''
-    sed -i -e 's|extensions: |extensions: FlexibleContexts, |' happy.cabal
-    sed -i -e 's|> import System.Exit|> import System.Exit ( exitWith, ExitCode(..) )|' src/Main.lhs
-  '';
-  meta = {
-    homepage = "http://www.haskell.org/happy/";
-    description = "Happy is a parser generator for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/tools/parsing/happy/1.18.11.nix b/pkgs/development/tools/parsing/happy/1.19.4.nix
index e7abe930013..e7cd358fb82 100644
--- a/pkgs/development/tools/parsing/happy/1.18.11.nix
+++ b/pkgs/development/tools/parsing/happy/1.19.4.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happy";
-  version = "1.18.11";
-  sha256 = "1hssiihzl7xipmn5bz71q30wbq2sj92lh2f7z4jarckhldwcqfi9";
+  version = "1.19.4";
+  sha256 = "0vcklr1y6yjf8z4wip4al2zw4qlfxcahbdxwpf6c9y31dkv9kr3b";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ mtl ];
diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix
index 2457668d5b0..fe9c46dac64 100644
--- a/pkgs/tools/misc/jdiskreport/default.nix
+++ b/pkgs/tools/misc/jdiskreport/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, unzip, jre }:
 
 stdenv.mkDerivation rec {
-  name = "jdiskreport-1.4.0";
+  name = "jdiskreport-1.4.1";
 
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_4_0.zip;
-    sha256 = "0kx43480p89wlyza94lzqygqfafsdf964syc2c24q28y42psz4kd";
+    url = http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_4_1.zip;
+    sha256 = "0d5mzkwsbh9s9b1vyvpaawqc09b0q41l2a7pmwf7386b1fsx6d58";
   };
 
   buildInputs = [ unzip ];
diff --git a/pkgs/tools/package-management/cabal-install/0.14.0.nix b/pkgs/tools/package-management/cabal-install/0.14.0.nix
index 15fe5f1e22c..72ed7414971 100644
--- a/pkgs/tools/package-management/cabal-install/0.14.0.nix
+++ b/pkgs/tools/package-management/cabal-install/0.14.0.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, Cabal, filepath, HTTP, mtl, network, random, time, zlib }:
 
 cabal.mkDerivation (self: {
diff --git a/pkgs/tools/package-management/cabal-install/1.16.0.2.nix b/pkgs/tools/package-management/cabal-install/1.16.0.2.nix
index 8f28f57c18f..14fc25bc8dc 100644
--- a/pkgs/tools/package-management/cabal-install/1.16.0.2.nix
+++ b/pkgs/tools/package-management/cabal-install/1.16.0.2.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, Cabal, filepath, HTTP, mtl, network, random, time, zlib }:
 
 cabal.mkDerivation (self: {
diff --git a/pkgs/tools/package-management/cabal-install/1.18.0.3.nix b/pkgs/tools/package-management/cabal-install/1.18.0.3.nix
index 041cc471cab..31d43cc85d8 100644
--- a/pkgs/tools/package-management/cabal-install/1.18.0.3.nix
+++ b/pkgs/tools/package-management/cabal-install/1.18.0.3.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, Cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck
 , random, stm, testFramework, testFrameworkHunit
 , testFrameworkQuickcheck2, time, zlib
diff --git a/pkgs/tools/package-management/cabal-install/1.20.0.3.nix b/pkgs/tools/package-management/cabal-install/1.20.0.3.nix
index ffcaee203b7..8c136dc9dbb 100644
--- a/pkgs/tools/package-management/cabal-install/1.20.0.3.nix
+++ b/pkgs/tools/package-management/cabal-install/1.20.0.3.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, Cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck
 , random, stm, testFramework, testFrameworkHunit
 , testFrameworkQuickcheck2, time, zlib
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index b81ab7cad42..19243bad902 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.8pre3636_9d0709e";
+  name = "nix-1.8pre3666_5bcb982";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/11854244/download/5/${name}.tar.xz";
-    sha256 = "13h32d4nbkhvxhj9nyamxf6mfsi7mzvjz1bhyy63088vx468nhmm";
+    url = "http://hydra.nixos.org/build/12516859/download/5/${name}.tar.xz";
+    sha256 = "6b968ec6db727dad2dc1fb6d31395996bd7cad14fddadfa996661c1f2c142c32";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];
diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix
index ade7fd202d5..ce531a92022 100644
--- a/pkgs/tools/typesetting/lhs2tex/default.nix
+++ b/pkgs/tools/typesetting/lhs2tex/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, filepath, mtl, regexCompat, texLive }:
 
 cabal.mkDerivation (self: {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 794c7599295..6776bb3c618 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7458,7 +7458,7 @@ let
 
   # The current default kernel / kernel modules.
   linux = linuxPackages.kernel;
-  linuxPackages = linuxPackages_3_14;
+  linuxPackages = linuxPackages_3_12;
 
   # Update this when adding the newest kernel major version!
   linux_latest = pkgs.linux_3_15;
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 38d4774ce13..a81f8cae90a 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -209,8 +209,8 @@
                ghcBinary = pkgs.haskellPackages.ghcPlain;
                prefFun = ghcHEADPrefs;
                extraArgs = {
-                 happy = pkgs.haskellPackages.happy_1_19_2;
-                 alex = pkgs.haskellPackages.alex_3_1_3;
+                 happy = pkgs.haskellPackages.happy;
+                 alex = pkgs.haskellPackages.alex;
                };
              };
 
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index eacf52a1fbf..a0780e29b1b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -555,6 +555,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   dataenc = callPackage ../development/libraries/haskell/dataenc {};
 
+  dataFix = callPackage ../development/libraries/haskell/data-fix {};
+
   dataHash = callPackage ../development/libraries/haskell/data-hash {};
 
   dataInttrie = callPackage ../development/libraries/haskell/data-inttrie {};
@@ -700,6 +702,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   encoding = callPackage ../development/libraries/haskell/encoding {};
 
+  engineIo = callPackage ../development/libraries/haskell/engine-io {};
+  engineIoSnap = callPackage ../development/libraries/haskell/engine-io-snap {};
+
   enumerator = callPackage ../development/libraries/haskell/enumerator {};
 
   enummapset = callPackage ../development/libraries/haskell/enummapset {};
@@ -1986,8 +1991,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   sbv = callPackage ../development/libraries/haskell/sbv {};
 
   scientific_0_2_0_2 = callPackage ../development/libraries/haskell/scientific/0.2.0.2.nix {};
-  scientific_0_3_2_1 = callPackage ../development/libraries/haskell/scientific/0.3.2.1.nix {};
-  scientific = self.scientific_0_3_2_1;
+  scientific_0_3_3_0 = callPackage ../development/libraries/haskell/scientific/0.3.3.0.nix {};
+  scientific = self.scientific_0_3_3_0;
 
   scotty = callPackage ../development/libraries/haskell/scotty {};
 
@@ -2009,6 +2014,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   setlocale = callPackage ../development/libraries/haskell/setlocale {};
 
+
+  shellish = callPackage ../development/libraries/haskell/shellish {};
+
   shellmate = callPackage ../development/libraries/haskell/shellmate {};
 
   shelly_0_15_4_1 = callPackage ../development/libraries/haskell/shelly/0.15.4.1.nix {};
@@ -2063,6 +2071,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   socks = callPackage ../development/libraries/haskell/socks {};
 
+  socketIo = callPackage ../development/libraries/haskell/socket-io {};
+
   sparse = callPackage ../development/libraries/haskell/sparse {};
 
   spawn = callPackage ../development/libraries/haskell/spawn {};
@@ -2428,7 +2438,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   unorderedContainers_0_2_3_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.3.0.nix {};
   unorderedContainers_0_2_4_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.4.0.nix {};
-  unorderedContainers = self.unorderedContainers_0_2_4_0;
+  unorderedContainers_0_2_5_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.5.0.nix {};
+  unorderedContainers = self.unorderedContainers_0_2_5_0;
 
   uri = callPackage ../development/libraries/haskell/uri {};
 
@@ -2738,13 +2749,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   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 {};
   happy_1_18_6 = callPackage ../development/tools/parsing/happy/1.18.6.nix {};
-  happy_1_18_8 = callPackage ../development/tools/parsing/happy/1.18.8.nix {};
   happy_1_18_9 = callPackage ../development/tools/parsing/happy/1.18.9.nix {};
   happy_1_18_10 = callPackage ../development/tools/parsing/happy/1.18.10.nix {};
-  happy_1_18_11 = callPackage ../development/tools/parsing/happy/1.18.11.nix {};
-  happy_1_19_2 = callPackage ../development/tools/parsing/happy/1.19.2.nix {};
-  happy_1_19_3 = callPackage ../development/tools/parsing/happy/1.19.3.nix {};
-  happy = self.happy_1_19_3;
+  happy_1_19_4 = callPackage ../development/tools/parsing/happy/1.19.4.nix {};
+  happy = self.happy_1_19_4;
 
   happyMeta = callPackage ../development/tools/haskell/happy-meta {};