diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 6e53114354c..167a231af8b 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -249,6 +249,7 @@
   koral = "Koral <koral@mailoo.org>";
   kovirobi = "Kovacsics Robert <kovirobi@gmail.com>";
   kragniz = "Louis Taylor <louis@kragniz.eu>";
+  kristoff3r = "Kristoffer Søholm <k.soeholm@gmail.com>";
   ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
   lassulus = "Lassulus <lassulus@gmail.com>";
   layus = "Guillaume Maudoux <layus.on@gmail.com>";
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 1566dbe1677..d51b29b99da 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -287,6 +287,7 @@
       pdns-recursor = 269;
       kresd = 270;
       rpc = 271;
+      geoip = 272;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -543,6 +544,7 @@
       gogs = 268;
       kresd = 270;
       #rpc = 271; # unused
+      #geoip = 272; # unused
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index e37c55aa1ac..b51c8b4996b 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -212,6 +212,17 @@ let
         '';
       };
 
+      enableKwallet = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          If enabled, pam_wallet will attempt to automatically unlock the
+          user's default KDE wallet upon login. If the user has no wallet named
+          "kdewallet", or the login password does not match their wallet
+          password, KDE will prompt separately after login.
+        '';
+      };
+
       text = mkOption {
         type = types.nullOr types.lines;
         description = "Contents of the PAM service file.";
@@ -262,12 +273,15 @@ let
           # prompts the user for password so we run it once with 'required' at an
           # earlier point and it will run again with 'sufficient' further down.
           # We use try_first_pass the second time to avoid prompting password twice
-          (optionalString (cfg.unixAuth && (config.security.pam.enableEcryptfs || cfg.pamMount)) ''
+          (optionalString (cfg.unixAuth && (config.security.pam.enableEcryptfs || cfg.pamMount || cfg.enableKwallet)) ''
               auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth
               ${optionalString config.security.pam.enableEcryptfs
                 "auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}
               ${optionalString cfg.pamMount
                 "auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
+              ${optionalString cfg.enableKwallet
+                ("auth optional ${pkgs.kde5.kwallet-pam}/lib/security/pam_kwallet5.so" +
+                 " kwalletd=${pkgs.kde5.kwallet}/bin/kwalletd5")}
             '') + ''
           ${optionalString cfg.unixAuth
               "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"}
@@ -334,6 +348,9 @@ let
               "session optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
           ${optionalString (cfg.enableAppArmor && config.security.apparmor.enable)
               "session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"}
+          ${optionalString (cfg.enableKwallet)
+              ("session optional ${pkgs.kde5.kwallet-pam}/lib/security/pam_kwallet5.so" +
+               " kwalletd=${pkgs.kde5.kwallet}/bin/kwalletd5")}
         '');
     };
 
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index cdf7e5a1765..861ce225257 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -99,31 +99,35 @@ in
     security.wrappers = lib.mkOption {
       type = lib.types.attrs;
       default = {};
-      example = {
-        sendmail.source = "/nix/store/.../bin/sendmail";
-        ping = {
-          source  = "${pkgs.iputils.out}/bin/ping";
-          owner   = "nobody";
-          group   = "nogroup";
-          capabilities = "cap_net_raw+ep";
-        };
-      };
+      example = lib.literalExample
+        ''
+          { sendmail.source = "/nix/store/.../bin/sendmail";
+            ping = {
+              source  = "${pkgs.iputils.out}/bin/ping";
+              owner   = "nobody";
+              group   = "nogroup";
+              capabilities = "cap_net_raw+ep";
+            };
+          }
+        '';
       description = ''
         This option allows the ownership and permissions on the setuid
         wrappers for specific programs to be overridden from the
         default (setuid root, but not setgid root).
 
         <note>
+          <para>The sub-attribute <literal>source</literal> is mandatory,
+          it must be the absolute path to the program to be wrapped.
+          </para>
+
+          <para>The sub-attribute <literal>program</literal> is optional and
+          can give the wrapper program a new name. The default name is the same
+          as the attribute name itself.</para>
+
           <para>Additionally, this option can set capabilities on a
           wrapper program that propagates those capabilities down to the
           wrapped, real program.</para>
 
-          <para>The <literal>program</literal> attribute is the name of
-          the program to be wrapped. If no <literal>source</literal>
-          attribute is provided, specifying the absolute path to the
-          program, then the program will be searched for in the path
-          environment variable.</para>
-
           <para>NOTE: cap_setpcap, which is required for the wrapper
           program to be able to raise caps into the Ambient set is NOT
           raised to the Ambient set so that the real program cannot
diff --git a/nixos/modules/services/misc/geoip-updater.nix b/nixos/modules/services/misc/geoip-updater.nix
index 021ee02782d..5135fac8f7d 100644
--- a/nixos/modules/services/misc/geoip-updater.nix
+++ b/nixos/modules/services/misc/geoip-updater.nix
@@ -251,6 +251,12 @@ in
       }
     ];
 
+    users.extraUsers.geoip = {
+      group = "root";
+      description = "GeoIP database updater";
+      uid = config.ids.uids.geoip;
+    };
+
     systemd.timers.geoip-updater =
       { description = "GeoIP Updater Timer";
         partOf = [ "geoip-updater.service" ];
@@ -267,11 +273,11 @@ in
       preStart = ''
         mkdir -p "${cfg.databaseDir}"
         chmod 755 "${cfg.databaseDir}"
-        chown nobody:root "${cfg.databaseDir}"
+        chown geoip:root "${cfg.databaseDir}"
       '';
       serviceConfig = {
         ExecStart = "${geoip-updater}/bin/geoip-updater";
-        User = "nobody";
+        User = "geoip";
         PermissionsStartOnly = true;
       };
     };
@@ -285,11 +291,11 @@ in
       preStart = ''
         mkdir -p "${cfg.databaseDir}"
         chmod 755 "${cfg.databaseDir}"
-        chown nobody:root "${cfg.databaseDir}"
+        chown geoip:root "${cfg.databaseDir}"
       '';
       serviceConfig = {
         ExecStart = "${geoip-updater}/bin/geoip-updater --skip-existing";
-        User = "nobody";
+        User = "geoip";
         PermissionsStartOnly = true;
         # So it won't be (needlessly) restarted:
         RemainAfterExit = true;
diff --git a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix
index 7a343299c31..388e4d4ac01 100644
--- a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix
+++ b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix
@@ -54,6 +54,7 @@ in {
         Restart = "always";
         PrivateTmp = true;
         WorkingDirectory = /tmp;
+        AmbientCapabilities = [ "CAP_NET_RAW" ]; # for ping probes
         ExecStart = ''
           ${pkgs.prometheus-blackbox-exporter}/bin/blackbox_exporter \
             -web.listen-address :${toString cfg.port} \
diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix
index 9b06cccca79..bc7d6912b5c 100644
--- a/nixos/modules/services/networking/quassel.nix
+++ b/nixos/modules/services/networking/quassel.nix
@@ -25,12 +25,12 @@ in
 
       package = mkOption {
         type = types.package;
-        default = pkgs.quasselDaemon_qt5;
-        defaultText = "pkgs.quasselDaemon_qt5";
+        default = pkgs.quasselDaemon;
+        defaultText = "pkgs.quasselDaemon";
         description = ''
           The package of the quassel daemon.
         '';
-        example = literalExample "pkgs.quasselDaemon_qt5";
+        example = literalExample "pkgs.quasselDaemon";
       };
 
       interfaces = mkOption {
diff --git a/nixos/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix
index f3ada6b7496..0216c9771c9 100644
--- a/nixos/modules/services/scheduling/atd.nix
+++ b/nixos/modules/services/scheduling/atd.nix
@@ -42,13 +42,14 @@ in
 
   config = mkIf cfg.enable {
 
-    security.wrappers = map (program: {"${program}" = {
-      source = "${pkgs.atd}/bin/${program}";
+    security.wrappers = builtins.listToAttrs (
+      map (program: { name = "${program}"; value = {
+      source = "${at}/bin/${program}";
       owner = "atd";
       group = "atd";
       setuid = true;
       setgid = true;
-    };}) [ "at" "atq" "atrm" "batch" ];
+    };}) [ "at" "atq" "atrm" "batch" ]);
 
     environment.systemPackages = [ at ];
 
diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix
index cc6eb96bf5d..6eb277d0a2f 100644
--- a/nixos/modules/services/scheduling/cron.nix
+++ b/nixos/modules/services/scheduling/cron.nix
@@ -93,7 +93,7 @@ in
 
     { services.cron.enable = mkDefault (allFiles != []); }
     (mkIf (config.services.cron.enable) {
-      security.wrappers.crontab.source = "${pkgs.cronNixosPkg.out}/bin/crontab";
+      security.wrappers.crontab.source = "${cronNixosPkg}/bin/crontab";
       environment.systemPackages = [ cronNixosPkg ];
       environment.etc.crontab =
         { source = pkgs.runCommand "crontabs" { inherit allFiles; preferLocalBuild = true; }
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 06f9f0a62ef..1b44b9e42c8 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -103,6 +103,8 @@ in
           kde5.kservice
           kde5.ktextwidgets
           kde5.kwallet
+          kde5.kwallet-pam
+          kde5.kwalletmanager
           kde5.kwayland
           kde5.kwidgetsaddons
           kde5.kxmlgui
@@ -234,6 +236,14 @@ in
 
       security.pam.services.kde = { allowNullPassword = true; };
 
+      # Doing these one by one seems silly, but we currently lack a better
+      # construct for handling common pam configs.
+      security.pam.services.gdm.enableKwallet = true;
+      security.pam.services.kdm.enableKwallet = true;
+      security.pam.services.lightdm.enableKwallet = true;
+      security.pam.services.sddm.enableKwallet = true;
+      security.pam.services.slim.enableKwallet = true;
+
       # use kimpanel as the default IBus panel
       i18n.inputMethod.ibus.panel =
         lib.mkDefault
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index 8bd35385739..8a4299113f2 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -5,6 +5,11 @@ with utils;
 
 let
 
+  addCheckDesc = desc: elemType: check: types.addCheck elemType check
+    // { description = "${elemType.description} (with check: ${desc})"; };
+  nonEmptyStr = addCheckDesc "non-empty" types.str
+    (x: x != "" && ! (all (c: c == " " || c == "\t") (stringToCharacters x)));
+
   fileSystems' = toposort fsBefore (attrValues config.fileSystems);
 
   fileSystems = if fileSystems' ? "result"
@@ -26,21 +31,21 @@ let
 
       mountPoint = mkOption {
         example = "/mnt/usb";
-        type = types.str;
+        type = nonEmptyStr;
         description = "Location of the mounted the file system.";
       };
 
       device = mkOption {
         default = null;
         example = "/dev/sda";
-        type = types.nullOr types.str;
+        type = types.nullOr nonEmptyStr;
         description = "Location of the device.";
       };
 
       fsType = mkOption {
         default = "auto";
         example = "ext3";
-        type = types.str;
+        type = nonEmptyStr;
         description = "Type of the file system.";
       };
 
@@ -48,7 +53,7 @@ let
         default = [ "defaults" ];
         example = [ "data=journal" ];
         description = "Options used to mount the file system.";
-        type = types.listOf types.str;
+        type = types.listOf nonEmptyStr;
       };
 
     };
@@ -67,7 +72,7 @@ let
       label = mkOption {
         default = null;
         example = "root-partition";
-        type = types.nullOr types.str;
+        type = types.nullOr nonEmptyStr;
         description = "Label of the device (if any).";
       };
 
diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix
index 0af376a90bc..3975dd5b0ff 100644
--- a/nixos/modules/tasks/kbd.nix
+++ b/nixos/modules/tasks/kbd.nix
@@ -71,7 +71,7 @@ in
   ###### implementation
 
   config = mkMerge [
-    (mkIf (!setVconsole || (setVconsole && config.boot.earlyVconsoleSetup)) {
+    (mkIf (!setVconsole) {
       systemd.services."systemd-vconsole-setup".enable = false;
     })
 
@@ -97,17 +97,25 @@ in
             printf "${makeColorCS n color}" >> /dev/console
           '') config.i18n.consoleColors}
         '';
-      }
 
-      (mkIf (!config.boot.earlyVconsoleSetup) {
+        /* XXX: systemd-vconsole-setup needs a "main" terminal. By default
+         * /dev/tty0 is used which wouldn't work when the service is restarted
+         * from X11. We set this to /dev/tty1; not ideal because it may also be
+         * owned by X11 or something else.
+         *
+         * See #22470.
+         */
         systemd.services."systemd-vconsole-setup" =
           { wantedBy = [ "sysinit.target" ];
             before = [ "display-manager.service" ];
             after = [ "systemd-udev-settle.service" ];
             restartTriggers = [ vconsoleConf kbdEnv ];
-            restartIfChanged = false; # fails when tty is inactive
+            serviceConfig.ExecStart = [
+              ""
+              "${pkgs.systemd}/lib/systemd/systemd-vconsole-setup /dev/tty1"
+            ];
           };
-      })
+      }
 
       (mkIf config.boot.earlyVconsoleSetup {
         boot.initrd.extraUtilsCommands = ''
diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix
index c9356c9b4ea..5797d9db436 100644
--- a/nixos/modules/virtualisation/amazon-init.nix
+++ b/nixos/modules/virtualisation/amazon-init.nix
@@ -1,20 +1,18 @@
-{ config, pkgs, modulesPath, ... }:
-
-# This attempts to pull a nix expression from this EC2 instance's user-data.
+{ config, pkgs, ... }:
 
 let
-  bootScript = pkgs.writeScript "bootscript.sh" ''
+  script = ''
     #!${pkgs.stdenv.shell} -eu
 
     echo "attempting to fetch configuration from EC2 user data..."
 
+    export HOME=/root
     export PATH=${pkgs.lib.makeBinPath [ config.nix.package pkgs.systemd pkgs.gnugrep pkgs.gnused config.system.build.nixos-rebuild]}:$PATH
     export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels
 
     userData=/etc/ec2-metadata/user-data
 
     if [ -s "$userData" ]; then
-
       # If the user-data looks like it could be a nix expression,
       # copy it over. Also, look for a magic three-hash comment and set
       # that as the channel.
@@ -43,7 +41,22 @@ let
     nixos-rebuild switch
   '';
 in {
-  boot.postBootCommands = ''
-    ${bootScript} &
-  '';
+  systemd.services.amazon-init = {
+    inherit script;
+    description = "Reconfigure the system from EC2 userdata on startup";
+
+    wantedBy = [ "sshd.service" ];
+    before = [ "sshd.service" ];
+    after = [ "network-online.target" ];
+    requires = [ "network-online.target" ];
+ 
+    restartIfChanged = false;
+    unitConfig.X-StopOnRemoval = false;
+
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+  };
 }
+
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 46b81cb0a54..fddd9e4920b 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -424,6 +424,29 @@ rec {
     };
   };
 
+  yedit = buildEclipsePlugin rec {
+    name = "yedit-${version}";
+    version = "1.0.20.201509041456";
+
+    srcFeature = fetchurl {
+      url = "http://dadacoalition.org/yedit/features/org.dadacoalition.yedit.feature_${version}-RELEASE.jar";
+      sha256 = "0rps73y19gwlrdr8jjrg3rhcaaagghnmri8297inxc5q2dvg0mlk";
+    };
+
+    srcPlugin = fetchurl {
+      url = "http://dadacoalition.org/yedit/plugins/org.dadacoalition.yedit_${version}-RELEASE.jar";
+      sha256 = "1wpyw4z28ka60z36f8m71kz1giajcm26wb9bpv18sjiqwdgx9v0z";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = https://github.com/oyse/yedit;
+      description = "A YAML editor plugin for Eclipse";
+      license = licenses.epl10;
+      platforms = platforms.all;
+      maintainers = [ maintainers.rycee ];
+    };
+  };
+
   zest = buildEclipseUpdateSite rec {
     name = "zest-${version}";
     version = "3.9.101";
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index d5ca5e39442..fbf8895f971 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -40,19 +40,19 @@ stdenv.mkDerivation rec {
     ## https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24358
     (fetchurl {
       url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=9afea93ed536fb9110ac62b413604cf4c4302199;
-      sha256 = "1iifyfqh7qfdfsrpqgz2l7z0l7alvma57jlklyq258qyjg0pc8n4"; })
+      sha256 = "0pshhq8wlh98m9hm8xd3g7gy3ms0l44dq6vgzkg67ydlccziqz40"; })
     (fetchurl {
       url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=71ca4f6a43bad06192cbc4bb8c7a2d69c179b7b0;
-      sha256 = "0vadqvcigca0j891yis1mhjn18rg4l9qj621q6vzip46ka6qig0d"; })
+      sha256 = "0h76wrrqyrky441immprskx5x7200zl7ajf7hyg4da22q7sr09qa"; })
     (fetchurl {
       url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=1047496722a58ef5b736dae64d32adeb58c5055c;
-      sha256 = "01lfa89qw7y0spcy57hm1ymijb57i6kvhb9z9impcxwza60lbi7b"; })
+      sha256 = "0hk9pi3f2zj266qj8armzpl0z8rfjg0m9ss4k09mgg1hyz80wdvv"; })
     (fetchurl {
       url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=96ac0c3ebce825e60595794f99e703ec8302e240;
-      sha256 = "0bmkrm356fbwc8wsiqh2w706mq5r9q4ic4m8vzdj099ihnf121nn"; })
+      sha256 = "1q2hqkjvj9z46b5ik56lv9wiibz09mvg2q3pn8fnpa04ki3zbh4x"; })
     (fetchurl {
       url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=43986d16fb6ad78a627250e14570ea70bdb1f23a;
-      sha256 = "0kp8dgs7fjgvidhm2y84jrxad78mxi0c47jhyszj5644qqxm47cr";
+      sha256 = "1wlyy04qahvls7bdrcxaazh9k27gksk7if1q58h83f7h6g9xxkzj";
     })
   ];
 
diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 39975c3dc69..0412d1d2d6c 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "8.0.0075";
+  version = "8.0.0329";
 
   src = fetchFromGitHub {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    sha256 = "1imhvrd90f797jlbzvx8sc08h53s55ns6jxy1kl5kh8lz1qq455w";
+    sha256 = "0dcvj2la5g6s87mx3vm96jk904xfmqbwi0jyds9bd3qgbpnn80r1";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index 47e30175795..860068c5667 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -1,29 +1,33 @@
-{ stdenv, fetchurl, pkgconfig, gtk, gettext, withBuildColors ? true, ncurses ? null}:
+{ stdenv, fetchurl, pkgconfig, gtk, gettext, ncurses
+, withBuildColors ? true
+}:
 
 assert withBuildColors -> ncurses != null;
 
-with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "girara-${version}";
-  version = "0.2.6";
+  version = "0.2.7";
 
   src = fetchurl {
-    url = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
-    sha256 = "03wsxj27hvcbs3x96nah7j3paclifwlfag8kdph4kldl48srp9pb";
+    url    = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
+    sha256 = "1r9jbhf9n40zj4ddqv1q5spijpjm683nxg4hr5lnir4a551s7rlq";
   };
 
   preConfigure = ''
-    sed -i 's/ifdef TPUT_AVAILABLE/ifneq ($(TPUT_AVAILABLE), 0)/' colors.mk
+    substituteInPlace colors.mk \
+      --replace 'ifdef TPUT_AVAILABLE' 'ifneq ($(TPUT_AVAILABLE), 0)'
   '';
 
   buildInputs = [ pkgconfig gtk gettext ];
 
-  makeFlags = [ "PREFIX=$(out)" ]
-    ++ optional withBuildColors "TPUT=${ncurses.out}/bin/tput"
-    ++ optional (!withBuildColors) "TPUT_AVAILABLE=0"
-    ;
+  makeFlags = [
+    "PREFIX=$(out)"
+    (if withBuildColors
+      then "TPUT=${ncurses.out}/bin/tput"
+      else "TPUT_AVAILABLE=0")
+  ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://pwmt.org/projects/girara/;
     description = "User interface library";
     longDescription = ''
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 4995c425699..a646cd10b6d 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -1,22 +1,28 @@
-{ stdenv, lib, fetchurl, pkgconfig, gtk, girara, ncurses, gettext, docutils
-, file, makeWrapper, sqlite, glib
-, synctexSupport ? true, texlive ? null }:
+{ stdenv, fetchurl, makeWrapper, pkgconfig
+, gtk, girara, ncurses, gettext, docutils
+, file, sqlite, glib, texlive
+, synctexSupport ? true
+}:
 
 assert synctexSupport -> texlive != null;
 
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
-  version = "0.3.6";
-  name = "zathura-core-${version}";
+  name    = "zathura-core-${version}";
+  version = "0.3.7";
 
   src = fetchurl {
-    url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
-    sha256 = "0fyb5hak0knqvg90rmdavwcmilhnrwgg1s5ykx9wd3skbpi8nsh8";
+    url    = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
+    sha256 = "1w0g74dq4z2vl3f99s2gkaqrb5pskgzig10qhbxj4gq9yj4zzbr2";
   };
 
   icon = ./icon.xpm;
 
-  buildInputs = [ pkgconfig file gtk girara gettext makeWrapper sqlite glib
-  ] ++ lib.optional synctexSupport texlive.bin.core;
+  buildInputs = [
+    pkgconfig file gtk girara
+    gettext makeWrapper sqlite glib
+  ] ++ optional synctexSupport texlive.bin.core;
 
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
 
@@ -25,11 +31,12 @@ stdenv.mkDerivation rec {
     "RSTTOMAN=${docutils}/bin/rst2man.py"
     "VERBOSE=1"
     "TPUT=${ncurses.out}/bin/tput"
-  ] ++ lib.optional synctexSupport "WITH_SYNCTEX=1";
+    (optionalString synctexSupport "WITH_SYNCTEX=1")
+  ];
 
   postInstall = ''
     wrapProgram "$out/bin/zathura" \
-      --prefix PATH ":" "${lib.makeBinPath [ file ]}" \
+      --prefix PATH ":" "${makeBinPath [ file ]}" \
       --prefix XDG_CONFIG_DIRS ":" "$out/etc"
 
     install -Dm644 $icon $out/share/pixmaps/pwmt.xpm
@@ -38,11 +45,11 @@ stdenv.mkDerivation rec {
     echo "Icon=pwmt" >> $out/share/applications/zathura.desktop
   '';
 
-  meta = with stdenv.lib; {
-    homepage = http://pwmt.org/projects/zathura/;
+  meta = {
+    homepage    = http://pwmt.org/projects/zathura/;
     description = "A core component for zathura PDF viewer";
-    license = licenses.zlib;
-    platforms = platforms.linux;
+    license     = licenses.zlib;
+    platforms   = platforms.linux;
     maintainers = with maintainers; [ garbas ];
   };
 }
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index cb0309bac89..02b7ec34cfc 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -94,12 +94,12 @@ let
 
   flash = stdenv.mkDerivation rec {
     name = "flashplayer-ppapi-${version}";
-    version = "24.0.0.194";
+    version = "24.0.0.221";
 
     src = fetchzip {
       url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
           + "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 = "1l9gz81mwb4p1yj9n8s7hrkxdyw0amcpcc3295dq7zhsr35dm76z";
+      sha256 = "0vqvb098wms9v2r1xm9yq4cpn1h9dr1y7izfy2rwg3y7gr8ycv80";
       stripRoot = false;
     };
 
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 8db066516c2..2f57456f309 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -2,16 +2,15 @@
 
 buildGoPackage rec {
   name = "terraform-${version}";
-  version = "0.8.6";
-  rev = "v${version}";
+  version = "0.8.7";
 
   goPackagePath = "github.com/hashicorp/terraform";
 
   src = fetchFromGitHub {
-    inherit rev;
-    owner = "hashicorp";
-    repo = "terraform";
-    sha256 = "1yrsb940xx4iqjz4s6c4dbmxzmqzffrxn6if7ywixg4dgpi279mx";
+    owner  = "hashicorp";
+    repo   = "terraform";
+    rev    = "v${version}";
+    sha256 = "0b30m0qc50x84klc8ggc3i83z36l46b1qmc8mpw90mxp07ra8vbw";
   };
 
   postInstall = ''
diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index 48d05fa9663..4c5c6fe53ce 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "terragrunt-${version}";
-  version = "0.10.0";
+  version = "0.10.1";
 
   goPackagePath = "github.com/gruntwork-io/terragrunt";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev    = "v${version}";
     owner  = "gruntwork-io";
     repo   = "terragrunt";
-    sha256 = "1cdhl7rqd2jslvp1ia1gph1lg0sjzsnvj7dj6lg85jfdcffafygj";
+    sha256 = "04q9wm8dnbm1pcy9i3c7ral49k3z10a7gx7h6h4bsvjy1sdf58vz";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix
index 91425c30121..bb438ef4e32 100644
--- a/pkgs/applications/networking/cluster/terragrunt/deps.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix
@@ -5,8 +5,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/aws/aws-sdk-go";
-      rev = "63102d196e0996a2910839857c3584f62be907cc";
-      sha256 = "0n207g4bf5fjq23f63nkhh14shj7kjdrr4qn6h28d7x2vqfb9pss";
+      rev = "f85f603a3e5b4d0eb9516dddb33778918f3b45c6";
+      sha256 = "10frgavkbsqpfninrlgwh64qjx9rwyjzbdfrikciv75v1gljh6zv";
     };
   }
   {
@@ -95,8 +95,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/urfave/cli";
-      rev = "347a9884a87374d000eec7e6445a34487c1f4a2b";
-      sha256 = "0wii48b2g5dyp6bknnlgs3ln93qxz5jvi96420wnpkkz51nrcmbp";
+      rev = "2526b57c56f30b50466c96c4133b1a4ad0f0191f";
+      sha256 = "03vvr1wq4pw2fixxsbr1d623hwqxf93d07p8vjml6iyd6k97b15p";
     };
   }
 ]
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
index 90f6655d145..3997980bed4 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
@@ -1,29 +1,27 @@
 { stdenv, fetchFromGitHub, libtoxcore, pidgin, autoreconfHook, libsodium }:
 
-let
-  version = "dd181722ea";
-  date = "20141202";
-in
 stdenv.mkDerivation rec {
-  name = "tox-prpl-${date}-${version}";
+  name = "tox-prpl-${version}";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
-    owner = "jin-eld";
-    repo = "tox-prpl";
-    rev = "${version}";
-    sha256 = "0wzyvg11h4ym28zqd24p35lza3siwm2519ga0yhk98rv458zks0v";
+    owner  = "jin-eld";
+    repo   = "tox-prpl";
+    rev    = "v${version}";
+    sha256 = "0ms367l2f7x83k407c93bmhpyc820f1css61fh2gx4jq13cxqq3p";
   };
 
   NIX_LDFLAGS = "-lssp -lsodium";
 
   postInstall = "mv $out/lib/purple-2 $out/lib/pidgin";
 
-  buildInputs = [ libtoxcore pidgin autoreconfHook libsodium ];
+  buildInputs = [ libtoxcore pidgin libsodium ];
+  nativeBuildInputs = [ autoreconfHook ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://tox.dhs.org/;
     description = "Tox plugin for Pidgin / libpurple";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index 9a26e2e4fc0..036d7fb3ce5 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -1,46 +1,31 @@
-{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore-dev, openal, opencv,
-  libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo,
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, openal, opencv,
+  libtoxcore, libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo, xorg,
   pango, atk, qrencode, ffmpeg, filter-audio, makeQtWrapper,
-  qtbase, qtsvg, qttools, qmakeHook, qttranslations, sqlcipher }:
-
-let
-  version = "1.5.0";
-  revision = "v${version}";
-in
+  qtbase, qtsvg, qttools, qttranslations, sqlcipher,
+  libvpx, libopus }:
 
 stdenv.mkDerivation rec {
   name = "qtox-${version}";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
-      owner = "tux3";
-      repo = "qTox";
-      rev = revision;
-      sha256 = "1na2qqzbdbjfw8kymxw5jfglslmw18fz3vpw805pqg4d5y7f7vsi";
+    owner  = "tux3";
+    repo   = "qTox";
+    rev    = "v${version}";
+    sha256 = "073kwfaw5n7vvcpwrpdbw5mlswbbwjipx7yy4a95r9z0gjljqnhq";
   };
 
-  buildInputs =
-    [
-      libtoxcore-dev openal opencv libsodium filter-audio
-      qtbase qttools qtsvg libXScrnSaver glib gtk2 cairo
-      pango atk qrencode ffmpeg qttranslations makeQtWrapper
-      sqlcipher
-    ];
+  buildInputs = [
+    libtoxcore openal opencv libsodium filter-audio
+    qtbase qttools qtsvg libXScrnSaver glib gtk2 cairo
+    pango atk qrencode ffmpeg qttranslations
+    sqlcipher
+    libopus libvpx
+  ] ++ (with xorg; [
+    libpthreadstubs libXdmcp
+  ]);
 
-  nativeBuildInputs = [ pkgconfig qmakeHook ];
-
-  preConfigure = ''
-    # patch .pro file for proper set of the git hash
-    sed -i '/git rev-parse/d' qtox.pro
-    sed -i 's/$$quote($$GIT_VERSION)/${revision}/' qtox.pro
-    # since .pro have hardcoded paths, we need to explicitly set paths here
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags glib-2.0)"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gdk-pixbuf-2.0)"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0)"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags cairo)"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags pango)"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags atk)"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags sqlcipher)"
-  '';
+  nativeBuildInputs = [ cmake makeQtWrapper pkgconfig ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix
index be72895b430..fb7a13b3af9 100644
--- a/pkgs/applications/networking/instant-messengers/toxic/default.nix
+++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix
@@ -1,26 +1,27 @@
 { stdenv, fetchFromGitHub, libsodium, ncurses, curl
-, libtoxcore-dev, openal, libvpx, freealut, libconfig, pkgconfig
-, libqrencode }:
+, libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig, libopus
+, libqrencode, gdk_pixbuf, libnotify }:
 
 stdenv.mkDerivation rec {
-  name = "toxic-dev-20160728";
+  name = "toxic-${version}";
+  version = "0.7.2";
 
   src = fetchFromGitHub {
-    owner = "Tox";
-    repo = "toxic";
-    rev = "cb21672600206423c844306a84f8b122e534c348";
-    sha256 = "1nq1xnbyjfrk8jrjvk5sli1bm3i9r8b4m8f4xgmiz68mx1r3fn5k";
+    owner  = "Tox";
+    repo   = "toxic";
+    rev    = "v${version}";
+    sha256 = "1kws6bx5va1wc0k6pqihrla91vicxk4zqghvxiylgfbjr1jnkvwc";
   };
 
-  makeFlags = [ "PREFIX=$(out)" ];
-  installFlags = [ "PREFIX=$(out)" ];
+  makeFlags = [ "PREFIX=$(out)"];
+  installFlags = [ "PREFIX=$(out)"];
 
-  nativeBuildInputs = [ pkgconfig libconfig ];
   buildInputs = [
-    libtoxcore-dev libsodium ncurses curl
+    libtoxcore libsodium ncurses curl gdk_pixbuf libnotify
   ] ++ stdenv.lib.optionals (!stdenv.isArm) [
-    openal libvpx freealut libqrencode
+    openal libopus libvpx freealut libqrencode
   ];
+  nativeBuildInputs = [ pkgconfig libconfig ];
 
   meta = with stdenv.lib; {
     description = "Reference CLI for Tox";
diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix
index 75995a6c5e3..0653558c940 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -1,20 +1,26 @@
-{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore-dev, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l
 , libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium }:
 
 stdenv.mkDerivation rec {
   name = "utox-${version}";
-  version = "0.9.8";
+  version = "0.12.2";
 
   src = fetchFromGitHub {
-    owner = "GrayHatter";
-    repo = "uTox";
-    rev = "v${version}";
-    sha256 = "0ahwdwqhi1gmvw80jihc1ba4cqqnx8ifjnzazxidfdky4ikzccmn";
+    owner  = "uTox";
+    repo   = "uTox";
+    rev    = "v${version}";
+    sha256 = "1y26dpx0qc01mhv2f325ymyc3r7ihayrr10rp25p1bs24010azwn";
   };
 
-  buildInputs = [ pkgconfig libtoxcore-dev dbus libvpx libX11 openal freetype
-                  libv4l libXrender fontconfig libXext libXft filter-audio
-                  git libsodium ];
+  buildInputs = [
+    libtoxcore dbus libvpx libX11 openal freetype
+    libv4l libXrender fontconfig libXext libXft filter-audio
+    libsodium
+  ];
+
+  nativeBuildInputs = [
+    cmake git pkgconfig
+  ];
 
   doCheck = false;
 
diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index 88e2ede631b..d46539a88b7 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.0";
+  version = "1.0.1";
   name = "irssi-${version}";
 
   src = fetchurl {
     url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz";
-    sha256 = "11x47ahkvzzx3xkvqak34235ghnpln65v13k77xx32c85nvb63kr";
+    sha256 = "1nqrm376bipvh4x483vygydjzs05n4fmfzip1gfakq1vfqqfhshr";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix
index 154d6442a2f..255192a9128 100644
--- a/pkgs/applications/version-management/monotone-viz/default.nix
+++ b/pkgs/applications/version-management/monotone-viz/default.nix
@@ -1,4 +1,12 @@
-{stdenv, fetchurl, ocaml, lablgtk, libgnomecanvas, camlp4, glib, pkgconfig, graphviz_2_0, makeWrapper}:
+{stdenv, fetchurl, ocaml, lablgtk, libgnomecanvas, camlp4, glib, pkgconfig, makeWrapper
+, libtool, libpng, yacc, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw
+}:
+# We need an old version of Graphviz for format compatibility reasons.
+# This version is vulnerable, but monotone-viz will never feed it bad input.
+let graphviz_2_0 = import ./graphviz-2.0.nix {
+      inherit stdenv fetchurl pkgconfig xlibsWrapper libpng libjpeg expat libXaw
+        yacc libtool fontconfig pango gd libwebp;
+    }; in
 stdenv.mkDerivation rec {
   version = "1.0.2";
   name = "monotone-viz-${version}";
diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
similarity index 100%
rename from pkgs/tools/graphics/graphviz/2.0.nix
rename to pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix
index 5a79c0829b5..8388e387075 100644
--- a/pkgs/applications/window-managers/compton/default.nix
+++ b/pkgs/applications/window-managers/compton/default.nix
@@ -1,38 +1,52 @@
-{ stdenv, fetchurl, pkgconfig, dbus, libconfig, libdrm, libxml2, mesa, pcre,
-  libXcomposite, libXfixes, libXdamage, libXinerama, libXrandr, libXrender,
-  libXext, xwininfo }:
+{ stdenv, lib, fetchFromGitHub, pkgconfig, asciidoc, docbook_xml_dtd_45
+, docbook_xsl, libxslt, libxml2, makeWrapper
+, dbus, libconfig, libdrm, mesa_noglu, pcre, libX11, libXcomposite, libXdamage
+, libXinerama, libXrandr, libXrender, libXext, xwininfo }:
 
 stdenv.mkDerivation rec {
-  name = "compton-0.1_beta2";
+  name = "compton-0.1_beta2.5";
 
-  src = fetchurl {
-    url = https://github.com/chjj/compton/releases/download/v0.1_beta2/compton-git-v0.1_beta2-2013-10-21.tar.xz;
-    sha256 = "1mpgn1d98dv66xs2j8gaxjiw26nzwl9a641lrday7h40g3k45g9v";
+  src = fetchFromGitHub {
+    owner = "chjj";
+    repo = "compton";
+    rev = "b7f43ee67a1d2d08239a2eb67b7f50fe51a592a8";
+    sha256 = "1p7ayzvm3c63q42na5frznq3rlr1lby2pdgbvzm1zl07wagqss18";
   };
 
   buildInputs = [
-    pkgconfig
-    dbus
-    libconfig
-    libdrm
-    libxml2
-    mesa
-    pcre
+    libX11
     libXcomposite
-    libXfixes
     libXdamage
-    libXinerama
-    libXrandr
     libXrender
+    libXrandr
     libXext
+    libXinerama
+    libdrm
+    pcre
+    libconfig
+    dbus
+    mesa_noglu
+  ];
+
+  nativeBuildInputs = [
+    pkgconfig
+    asciidoc
+    libxml2
+    docbook_xml_dtd_45
+    docbook_xsl
+    libxslt
+    makeWrapper
   ];
   
-  propagatedBuildInputs = [ xwininfo ];
-  
-  installFlags = "PREFIX=$(out)";
+  installFlags = [ "PREFIX=$(out)" ];
+
+  postInstall = ''
+    wrapProgram $out/bin/compton-trans \
+      --prefix PATH : ${lib.makeBinPath [ xwininfo ]}
+  '';
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/chjj/compton/;
+    homepage = "https://github.com/chjj/compton/";
     description = "A fork of XCompMgr, a sample compositing manager for X servers";
     longDescription = ''
       A fork of XCompMgr, which is a sample compositing manager for X
diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix
index ba0c812ef6a..7b60d573d1e 100644
--- a/pkgs/applications/window-managers/openbox/default.nix
+++ b/pkgs/applications/window-managers/openbox/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig
-, libxml2, libXinerama, libXcursor, libXau, libXrandr
+{ stdenv, fetchurl, pkgconfig, python2
+, libxml2, libXinerama, libXcursor, libXau, libXrandr, libICE, libSM
 , imlib2, pango, libstartup_notification, makeWrapper }:
 
 stdenv.mkDerivation rec {
@@ -8,8 +8,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig libxml2
-    libXinerama libXcursor libXau libXrandr
+    libXinerama libXcursor libXau libXrandr libICE libSM
     libstartup_notification makeWrapper
+    python2.pkgs.wrapPython
+  ];
+
+  pythonPath = with python2.pkgs; [
+    pyxdg
   ];
 
   propagatedBuildInputs = [
@@ -35,7 +40,8 @@ stdenv.mkDerivation rec {
     wrapProgram "$out/bin/openbox-session" --prefix XDG_DATA_DIRS : "$out/share"
     wrapProgram "$out/bin/openbox-gnome-session" --prefix XDG_DATA_DIRS : "$out/share"
     wrapProgram "$out/bin/openbox-kde-session" --prefix XDG_DATA_DIRS : "$out/share"
-    '';
+    wrapPythonPrograms
+  '';
 
   meta = {
     description = "X window manager for non-desktop embedded systems";
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index df4a33fbd46..79077b477b4 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchFromGitHub, pango, libinput
 , makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl, cairo
-, wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs
+, wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs, libcap
 }:
 
 let
-  version = "0.9";
+  version = "0.11";
 in
   stdenv.mkDerivation rec {
     name = "sway-${version}";
@@ -13,12 +13,12 @@ in
       owner = "Sircmpwn";
       repo = "sway";
       rev = "${version}";
-      sha256 = "0qqqg23rknxnjcgvkfrx3pijqc3dvi74qmmavq07vy2qfs1xlwg0";
+      sha256 = "01k01f72kh90fwgqh2hgg6dv9931x4v18bzz11b47mn7p9z68ddv";
     };
 
     nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ];
 
-    buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput ];
+    buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap ];
 
     patchPhase = ''
       sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt;
diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index e3759fe49cd..7071fa18c23 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -387,6 +387,9 @@ rec {
 
   # Python PyPI mirrors
   pypi = [
+    https://files.pythonhosted.org/packages/source/
+    # pypi.io is a more semantic link, but atm it’s referencing
+    # files.pythonhosted.org over two redirects
     https://pypi.io/packages/source/
   ];
 
diff --git a/pkgs/build-support/fetchzip/nix-prefetch-zip b/pkgs/build-support/fetchzip/nix-prefetch-zip
deleted file mode 100755
index d9a5f51057f..00000000000
--- a/pkgs/build-support/fetchzip/nix-prefetch-zip
+++ /dev/null
@@ -1,171 +0,0 @@
-#! /bin/sh -e
-
-usage(){
-    echo  >&2 "syntax: nix-prefetch-zip [OPTIONS] [URL [EXPECTED-HASH]]
-
-Options:
-      --url         url    The url of the archive to fetch.
-      --name        name   The name to use for the store path (defaults to \`basename \$url\`).
-      --ext         ext    The file extension (.zip, .tar.gz, ...) to be REMOVED from name
-      --hash        hash   The hash of unpacked archive.
-      --hash-type   type   Use the specified cryptographic hash algorithm, which can be one of md5, sha1, and sha256.
-      --leave-root         Keep the root directory of the archive.
-      --help               Show this help text.
-"
-    exit 1
-}
-
-
-name=""
-ext=""
-argi=0
-argfun=""
-for arg; do
-  if test -z "$argfun"; then
-    case $arg in
-      --url) argfun=set_url;;
-      --name) argfun=set_name;;
-      --ext) argfun=set_ext;;
-      --hash) argfun=set_expHash;;
-      --hash-type) argfun=set_hashType;;
-      --leave-root) leaveRoot=true;;
-      --help) usage;;
-      *) argi=$(($argi + 1))
-         case $argi in
-           1) url=$arg;;
-           2) rev=$arg;;
-           3) expHash=$arg;;
-           *) echo "Unexpected argument: $arg" >&2
-              usage
-              ;;
-         esac
-         ;;
-    esac
-  else
-    case $argfun in
-      set_*)
-        var=$(echo $argfun | sed 's,^set_,,')
-        eval "$var=\$arg"
-        ;;
-    esac
-    argfun=""
-  fi
-done
-
-if [ -z "$url" ]; then
-  echo "Error: No --url flag given" >&2
-  usage
-fi
-
-if [ -z "$name" ]; then
-  name=$(basename "$url")
-fi
-
-if test -z "$hashType"; then
-  hashType=sha256
-fi
-
-hashFormat="--base32"
-
-tmp=$(mktemp -d 2>/dev/null || mktemp -d -t "$$")
-trap "rm -rf '$tmp'" EXIT
-
-dirname=$(basename -s "$ext" "$name")
-
-unpackDirTmp=$tmp/unpacked-tmp/$dirname
-mkdir -p $unpackDirTmp
-
-unpackDir=$tmp/unpacked/$dirname
-mkdir -p $unpackDir
-
-downloadedFile=$tmp/$(basename "$url")
-
-unpackFile() {
-  local curSrc="$1"
-
-  case "$curSrc" in
-    *.tar.xz | *.tar.lzma)
-      # Don't rely on tar knowing about .xz.
-      xz -d < $curSrc | tar xf -
-      ;;
-    *.tar | *.tar.* | *.tgz | *.tbz2)
-      # GNU tar can automatically select the decompression method
-      # (info "(tar) gzip").
-      tar xf $curSrc
-      ;;
-    *.zip)
-      unzip -qq $curSrc
-      ;;
-    *)
-      echo "source archive $curSrc has unknown type" >&2
-      exit 1
-      ;;
-  esac
-}
-
-# If the hash was given, a file with that hash may already be in the
-# store.
-if test -n "$expHash"; then
-  finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" "$name")
-  if ! nix-store --check-validity "$finalPath" 2> /dev/null; then
-    finalPath=
-  fi
-  hash=$expHash
-fi
-
-# If we don't know the hash or a path with that hash doesn't exist,
-# download the file and add it to the store.
-if test -z "$finalPath"; then
-  curl="curl \
-   --location --max-redirs 20 \
-   --disable-epsv \
-   --insecure"
-
-  if ! $curl --fail "$url" --output "$downloadedFile"; then
-    echo "error: could not download $url" >&2
-    exit 1
-  fi
-
-  if [ -z "$leaveRoot" ]; then
-    shopt -s dotglob
-
-    cd "$unpackDirTmp"
-    unpackFile "$downloadedFile"
-
-    if [ $(ls "$unpackDirTmp" | wc -l) != 1 ]; then
-      echo "error: zip file must contain a single file or directory."
-      exit 1
-    fi
-
-    fn=$(cd "$unpackDirTmp" && echo *)
-
-    if [ -f "$unpackDirTmp/$fn" ]; then
-      mv "$unpackDirTmp/$fn" "$unpackDir"
-    else
-      mv "$unpackDirTmp/$fn/"* "$unpackDir/"
-    fi
-  else
-    cd $unpackDir
-    unpackFile "$downloadedFile"
-  fi
-
-  # Compute the hash.
-  hash=$(nix-hash --type $hashType $hashFormat $unpackDir)
-  if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi
-
-  # Add the downloaded file to the Nix store.
-  finalPath=$(nix-store --add-fixed --recursive "$hashType" $unpackDir)
-
-  if test -n "$expHash" -a "$expHash" != "$hash"; then
-    echo "hash mismatch for URL \`$url'"
-    exit 1
-  fi
-fi
-
-if ! test -n "$QUIET"; then echo "path is $finalPath" >&2; fi
-
-echo $hash
-
-if test -n "$PRINT_PATH"; then
-  echo $finalPath
-fi
diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 447fc1a94bd..fd8b50e4c0b 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -6,6 +6,6 @@
 fetchFromGitHub {
   owner = "commercialhaskell";
   repo = "all-cabal-hashes";
-  rev = "a7e72af80fb1e68d9a2c4a5927a253b71ed68239";
-  sha256 = "1ppk5r7yllvibsgxgs7k9kb2dcwh4pphf0876hcdh392cal47h3x";
+  rev = "53fcf983669a3f0cdfd795fec28ecb40740a64ca";
+  sha256 = "0jfrr6mjb3x1ybgrsinhm0nl3jmdjyf9mghpgsm75lgr83cm12a5";
 }
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix
index edb0075fdae..a9bb4514a3a 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix
@@ -3,7 +3,7 @@
 , spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala_0_32
 , libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg
 , desktop_file_utils, mtools, cdrkit, libcdio, numactl, xen
-, libusb, libarchive, acl, libgudev, qemu
+, libusb, libarchive, acl, libgudev, qemu, libsecret
 }:
 
 # TODO: ovirt (optional)
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol
     libuuid libsoup libosinfo systemd tracker vala_0_32 libcap_ng libcap yajl gmp
     gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive
-    librsvg desktop_file_utils acl libgudev numactl xen
+    librsvg desktop_file_utils acl libgudev numactl xen libsecret
   ];
 
   preFixup = ''
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix
index 7fa6fbf9da6..ff43d41c53a 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix
+++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-boxes-3.22.0";
+  name = "gnome-boxes-3.22.4";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-boxes/3.22/gnome-boxes-3.22.0.tar.xz;
-    sha256 = "9f02e3032f8b6aaa77d9eab6aabe7fc09902be429e266ad9fd4185b94ac867ee";
+    url = mirror://gnome/sources/gnome-boxes/3.22/gnome-boxes-3.22.4.tar.xz;
+    sha256 = "1wngw4c052p5ghdsd0mdrn20yi8xs0hjdq30rdwv9sqh40liqnjq";
   };
 }
diff --git a/pkgs/desktops/lxde/core/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix
index 06a0b5b8bff..b6b63e31615 100644
--- a/pkgs/desktops/lxde/core/lxappearance/default.nix
+++ b/pkgs/desktops/lxde/core/lxappearance/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, intltool, pkgconfig, libX11, gtk2 }:
 
 stdenv.mkDerivation rec {
-  name = "lxappearance-0.6.2";
+  name = "lxappearance-0.6.3";
 
   src = fetchurl{
     url = "mirror://sourceforge/project/lxde/LXAppearance/${name}.tar.xz";
-    sha256 = "07r0xbi6504zjnbpan7zrn7gi4j0kbsqqfpj8v2x94gr05p16qj4";
+    sha256 = "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A lightweight program for configuring the theme and fonts of gtk applications";
+    homepage = "http://lxde.org/";
     maintainers = [ stdenv.lib.maintainers.hinton ];
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.gpl2;
-    homepage = "http://lxde.org/";
   };
 }
diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix
index 1c3a21e2e44..d802aa4fe2e 100644
--- a/pkgs/development/compilers/mozart/binary.nix
+++ b/pkgs/development/compilers/mozart/binary.nix
@@ -1,25 +1,30 @@
-{ stdenv, fetchurl, boost, emacs, gmp, makeWrapper
+{ stdenv, fetchurl, makeWrapper
+, boost, gmp
 , tcl-8_5, tk-8_5
+, emacs
 }:
 
 let
-
   version = "2.0.0";
 
-in stdenv.mkDerivation {
+  binaries = {
+    "x86_64-linux" = fetchurl {
+      url = "mirror://sourceforge/project/mozart-oz/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz";
+      sha256 = "0rsfrjimjxqbwprpzzlmydl3z3aiwg5qkb052jixdxjyad7gyh5z";
+    };
+  };
+in
+
+stdenv.mkDerivation {
   name = "mozart-binary-${version}";
 
   preferLocalBuild = true;
 
-  src = fetchurl {
-    url = "mirror://sourceforge/project/mozart-oz/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz";
-    sha256 = "0rsfrjimjxqbwprpzzlmydl3z3aiwg5qkb052jixdxjyad7gyh5z";
-  };
+  src = binaries."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
 
   libPath = stdenv.lib.makeLibraryPath
     [ stdenv.cc.cc
       boost
-      emacs
       gmp
       tcl-8_5
       tk-8_5
@@ -27,10 +32,36 @@ in stdenv.mkDerivation {
 
   TK_LIBRARY = "${tk-8_5}/lib/tk8.5";
 
-  builder = ./builder.sh;
-
   buildInputs = [ makeWrapper ];
 
+  buildCommand = ''
+    mkdir $out
+    tar xvf $src -C $out --strip-components=1
+
+    for exe in $out/bin/{ozemulator,ozwish} ; do
+      patchelf --set-interpreter $(< $NIX_CC/nix-support/dynamic-linker) \
+               --set-rpath $libPath \
+               $exe
+    done
+
+    wrapProgram $out/bin/ozwish \
+      --set OZHOME $out \
+      --set TK_LIBRARY $TK_LIBRARY
+
+    wrapProgram $out/bin/ozemulator --set OZHOME $out
+
+    ${stdenv.lib.optionalString (emacs != null) ''
+      wrapProgram $out/bin/oz --suffix PATH ":" ${stdenv.lib.makeBinPath [ emacs ]}
+    ''}
+
+    sed -i $out/share/applications/oz.desktop \
+        -e "s,Exec=oz %u,Exec=$out/bin/oz %u,"
+
+    gzip -9n $out/share/mozart/elisp"/"*.elc
+
+    patchShebangs $out
+  '';
+
   meta = with stdenv.lib; {
     homepage = "http://www.mozart-oz.org/";
     description = "Multiplatform implementation of the Oz programming language";
@@ -42,6 +73,7 @@ in stdenv.mkDerivation {
       expressive power and advanced functionality.
     '';
     license = licenses.mit;
-    platforms = [ "x86_64-linux" ];
+    platforms = attrNames binaries;
+    hydraPlatforms = [];
   };
 }
diff --git a/pkgs/development/compilers/mozart/builder.sh b/pkgs/development/compilers/mozart/builder.sh
deleted file mode 100644
index b606d4c1bde..00000000000
--- a/pkgs/development/compilers/mozart/builder.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-source $stdenv/setup
-
-echo "unpacking $src..."
-tar xvfz $src
-
-mkdir -p $out/bin
-mkdir -p $out/share
-
-mv mozart*linux/bin/* $out/bin
-mv mozart*linux/share/* $out/share
-
-patchShebangs $out
-
-for f in $out/bin/*; do
-    b=$(basename $f)
-
-    if [ $b == "ozemulator" ] || [ $b == "ozwish" ]; then
-        patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-                 --set-rpath $libPath \
-                 $f
-        continue;
-    fi
-
-    wrapProgram $f --set OZHOME $out \
-                   --set TK_LIBRARY $TK_LIBRARY
-done
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f18582d501a..ff6dbfa1b09 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -62,7 +62,7 @@ self: super: {
     src = pkgs.fetchFromGitHub {
       owner = "joeyh";
       repo = "git-annex";
-      sha256 = "1vy6bj7f8zyj4n1r0gpi0r7mxapsrjvhwmsi5sbnradfng5j3jya";
+      sha256 = "0f79i2i1cr8j02vc4ganw92prbkv9ca1yl9jgkny0rxf28wdlc6v";
       rev = drv.version;
     };
   }))).override {
@@ -805,6 +805,9 @@ self: super: {
   # note: the library is unmaintained, no upstream issue
   dataenc = doJailbreak super.dataenc;
 
+  # https://github.com/divipp/ActiveHs-misc/issues/10
+  data-pprint = doJailbreak super.data-pprint;
+
   # horribly outdated (X11 interface changed a lot)
   sindre = markBroken super.sindre;
 
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 0a05cc6ca81..364c5bcdf32 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2223,10 +2223,8 @@ extra-packages:
   - containers < 0.5                    # required to build alex with GHC 6.12.3
   - control-monad-free < 0.6            # newer versions don't compile with anything but GHC 7.8.x
   - deepseq == 1.3.0.1                  # required to build Cabal with GHC 6.12.3
-  - esqueleto < 2.5                     # needed for git-annex: https://github.com/bitemyapp/esqueleto/issues/8
   - generic-deriving == 1.10.5.*        # new versions don't compile with GHC 7.10.x
   - gloss < 1.9.3                       # new versions don't compile with GHC 7.8.x
-  - hpack == 0.15.*                     # needed for stack-1.3.2
   - haddock < 2.17                      # required on GHC 7.10.x
   - haddock-api == 2.15.*               # required on GHC 7.8.x
   - haddock-api == 2.16.*               # required on GHC 7.10.x
@@ -2235,14 +2233,11 @@ extra-packages:
   - mtl < 2.2                           # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
   - mtl-prelude < 2                     # required for to build postgrest on mtl 2.1.x platforms
   - parallel == 3.2.0.3                 # newer versions don't work with GHC 6.12.3
-  - persistent == 2.2.*                 # needed for git-annex
-  - persistent-sqlite == 2.2.*          # needed for git-annex
-  - persistent-template == 2.1.*        # needed for git-annex
   - primitive == 0.5.1.*                # required to build alex with GHC 6.12.3
   - QuickCheck < 2                      # required by test-framework-quickcheck and its users
-  - servant-auth-server < 0.2.2.0       # https://github.com/plow-technologies/servant-auth/issues/25
   - seqid < 0.2                         # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
   - seqid-streams < 0.2                 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
+  - servant-auth-server < 0.2.2.0       # https://github.com/plow-technologies/servant-auth/issues/25
   - split < 0.2                         # newer versions don't work with GHC 6.12.3
   - tar < 0.4.2.0                       # later versions don't work with GHC < 7.6.x
   - transformers == 0.4.3.*             # the latest version isn't supported by mtl yet
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 07e1d55a1ae..b83d984b0bb 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -9180,8 +9180,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "HoleyMonoid";
-       version = "0.1.1";
-       sha256 = "d9a5fcfc1b388dcb7533dfd6916fc007cdfb2bbab48b820740c7226e32406dfc";
+       version = "0.1.2";
+       sha256 = "299f34a70c85f0f6858b7fb1af6b7466e81e543c4ad9d2007449d2dc977d4978";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/MedeaMelana/HoleyMonoid";
        description = "Monoids with holes";
@@ -16248,8 +16248,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "StringUtils";
-       version = "0.1.0.0";
-       sha256 = "9208f603ae362ab0788b7f61aa424e7b929e4eaaea97b6eca0a1b83c51eaacdb";
+       version = "0.2.0.0";
+       sha256 = "da88bf375d0889b428fb725c454d44c1c06a526477a18d20356a605554ab48c6";
        libraryHaskellDepends = [ base ];
        description = "String manipulation utilities";
        license = stdenv.lib.licenses.lgpl3;
@@ -20987,14 +20987,15 @@ self: {
 
   "airtable-api" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hashable, lens, text
-     , unordered-containers, wreq
+     , time, unordered-containers, wreq
      }:
      mkDerivation {
        pname = "airtable-api";
-       version = "0.1.0.4";
-       sha256 = "049949b130b19ee06c638494c95ca9b55fe3c071079a490ae10f01430c04b0dd";
+       version = "0.2.0.0";
+       sha256 = "aeb20ea165849959f6a4463dd85a0c3f4d41012bfd11b4b8eef65942f24f024a";
        libraryHaskellDepends = [
-         aeson base bytestring hashable lens text unordered-containers wreq
+         aeson base bytestring hashable lens text time unordered-containers
+         wreq
        ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/ooblahman/airtable-api";
@@ -23241,6 +23242,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "amazonka-s3-streaming_0_2_0_0" = callPackage
+    ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, base
+     , bytestring, conduit, conduit-extra, deepseq, dlist, exceptions
+     , http-client, lens, lifted-async, mmap, mmorph, mtl, resourcet
+     , text
+     }:
+     mkDerivation {
+       pname = "amazonka-s3-streaming";
+       version = "0.2.0.0";
+       sha256 = "d4a583eead4b7d050c9a6e762d77050cf07c5da541a04e25424850fa0e66dbd7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         amazonka amazonka-core amazonka-s3 base bytestring conduit deepseq
+         dlist exceptions http-client lens lifted-async mmap mmorph mtl
+         resourcet
+       ];
+       executableHaskellDepends = [
+         amazonka amazonka-core amazonka-s3 base bytestring conduit
+         conduit-extra text
+       ];
+       homepage = "https://github.com/Axman6/amazonka-s3-streaming#readme";
+       description = "Provides conduits to upload data to S3 using the Multipart API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-sdb" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -29397,6 +29425,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "benchpress_0_2_2_9" = callPackage
+    ({ mkDerivation, base, bytestring, mtl, time }:
+     mkDerivation {
+       pname = "benchpress";
+       version = "0.2.2.9";
+       sha256 = "15c696bdde79a1acf31633a81def65cec8c04bee14cf8b0d0fa6a32d995a4aab";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base mtl time ];
+       executableHaskellDepends = [ base bytestring ];
+       homepage = "https://github.com/WillSewell/benchpress";
+       description = "Micro-benchmarking with detailed statistics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bencode" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, parsec }:
      mkDerivation {
@@ -29963,6 +30007,8 @@ self: {
        pname = "binary";
        version = "0.8.4.1";
        sha256 = "8d13c700fe96c84644a2af37003f488668fe9cd1f8e5b316fc929de26ce7e7ba";
+       revision = "1";
+       editedCabalFile = "56a00340fec65458e3c7cfe1d63651db09dd8d6ac925f843aefd2e98f4adbd50";
        libraryHaskellDepends = [ array base bytestring containers ];
        testHaskellDepends = [
          array base bytestring Cabal containers directory filepath HUnit
@@ -32820,6 +32866,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bloodhound_0_13_0_0" = callPackage
+    ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers
+     , data-default-class, errors, exceptions, generics-sop, hashable
+     , hspec, http-client, http-types, mtl, mtl-compat, network-uri
+     , QuickCheck, quickcheck-properties, scientific, semigroups
+     , temporary, text, time, transformers, unix-compat
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "bloodhound";
+       version = "0.13.0.0";
+       sha256 = "65217195be1d4d29c99bfc05712e3aa6ed9f67d8e12180e703b67be1b093c4f9";
+       libraryHaskellDepends = [
+         aeson base blaze-builder bytestring containers data-default-class
+         exceptions hashable http-client http-types mtl mtl-compat
+         network-uri scientific semigroups text time transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers errors exceptions generics-sop
+         hspec http-client http-types mtl network-uri QuickCheck
+         quickcheck-properties semigroups temporary text time unix-compat
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/bitemyapp/bloodhound";
+       description = "ElasticSearch client library for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bloodhound-amazonka-auth" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core
      , amazonka-elasticsearch, base, bloodhound, exceptions, http-client
@@ -37096,6 +37172,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "case-insensitive_1_2_0_8" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit
+     , test-framework, test-framework-hunit, text
+     }:
+     mkDerivation {
+       pname = "case-insensitive";
+       version = "1.2.0.8";
+       sha256 = "27aa610a7e0128c346d4a5cddb5d395a85b0889e4a9912acbb3b9ccbc4e99f68";
+       libraryHaskellDepends = [ base bytestring deepseq hashable text ];
+       testHaskellDepends = [
+         base bytestring HUnit test-framework test-framework-hunit text
+       ];
+       homepage = "https://github.com/basvandijk/case-insensitive";
+       description = "Case insensitive string comparison";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "case-insensitive-match" = callPackage
     ({ mkDerivation, base, bytestring, mtl, QuickCheck, text }:
      mkDerivation {
@@ -40388,15 +40482,12 @@ self: {
      }:
      mkDerivation {
        pname = "clit";
-       version = "0.2.2.5";
-       sha256 = "e45c77e70996765c2d9f4e803add4e88c3a3701766ee1777eb067e49dff5c21f";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.2.2.6";
+       sha256 = "28913ec550761c623008250ef071840761216eaa1bb9e02b77c32c1dac6bb656";
        libraryHaskellDepends = [
          aeson authenticate-oauth base bytestring data-default http-client
          http-client-tls http-types lens optparse-applicative split text
        ];
-       executableHaskellDepends = [ base ];
        homepage = "https://github.com/vmchale/command-line-tweeter#readme";
        description = "Post tweets from stdin";
        license = stdenv.lib.licenses.bsd3;
@@ -42681,6 +42772,23 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "concurrent-output_1_7_9" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
+     , process, stm, terminal-size, text, transformers, unix
+     }:
+     mkDerivation {
+       pname = "concurrent-output";
+       version = "1.7.9";
+       sha256 = "343c9685d24795bb38761f5c3600df5c67dbc6d410e5e0b862aa8d092e4e10d5";
+       libraryHaskellDepends = [
+         ansi-terminal async base directory exceptions process stm
+         terminal-size text transformers unix
+       ];
+       description = "Ungarble output from several threads or commands";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "concurrent-rpc" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -45637,8 +45745,8 @@ self: {
      }:
      mkDerivation {
        pname = "credential-store";
-       version = "0.1.0.0";
-       sha256 = "568ba9a4d8a40a1ae074e08da76a0ad48c6507047e6cf89999cc3c0ebafd0f29";
+       version = "0.1.1";
+       sha256 = "35087bea87d96fdeec351805f2bd7d8bf277e96e7b6689e33b6c4ce5314c35e2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -46749,8 +46857,8 @@ self: {
      }:
      mkDerivation {
        pname = "csp";
-       version = "1.3";
-       sha256 = "8be3102fda62818d3ccb4649dc73b8cb6bb29d9620d7284023475297c6efdd32";
+       version = "1.3.1";
+       sha256 = "d83c5e51dd32a796af8cfacac94312cb99691be30d924e159bc1c4b8cef9530b";
        libraryHaskellDepends = [ base containers mtl nondeterminism ];
        testHaskellDepends = [ base nondeterminism tasty tasty-hunit ];
        description = "Discrete constraint satisfaction problem (CSP) solver";
@@ -53223,12 +53331,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "directory_1_3_0_1" = callPackage
+  "directory_1_3_0_2" = callPackage
     ({ mkDerivation, base, filepath, time, unix }:
      mkDerivation {
        pname = "directory";
-       version = "1.3.0.1";
-       sha256 = "b2b444aea7faac750efa23c994d9a16f207f12b2009cf38ba39fc7334f373f3c";
+       version = "1.3.0.2";
+       sha256 = "f9ee11de8bbaf7b8e2710d40ca0f1081fd1aaa609faede14a3706d60345c7aa3";
        libraryHaskellDepends = [ base filepath time unix ];
        testHaskellDepends = [ base filepath time unix ];
        description = "Platform-agnostic library for filesystem operations";
@@ -58756,6 +58864,8 @@ self: {
        pname = "equivalence";
        version = "0.3.2";
        sha256 = "7da21ed5f980caa18c995190dd527c69822050390e4237c92f1acbed7d5b0529";
+       revision = "1";
+       editedCabalFile = "c83ef0092c45011e4d58091d0d90fdd068ef8e04dddaf69e8df66631ef031604";
        libraryHaskellDepends = [
          base containers mtl STMonadTrans transformers transformers-compat
        ];
@@ -59142,33 +59252,6 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "esqueleto_2_4_3" = callPackage
-    ({ mkDerivation, base, blaze-html, bytestring, conduit, containers
-     , hspec, HUnit, monad-control, monad-logger, persistent
-     , persistent-sqlite, persistent-template, QuickCheck, resourcet
-     , tagged, text, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "esqueleto";
-       version = "2.4.3";
-       sha256 = "bf555cfb40519ed1573f7bb90c65f693b9639dfa93fc2222230d3ded6e897434";
-       revision = "1";
-       editedCabalFile = "651ee129d694aedefa6d6f54e4fd8950f1d8c817e2984141c2ef2fb9174b1e38";
-       libraryHaskellDepends = [
-         base blaze-html bytestring conduit monad-logger persistent
-         resourcet tagged text transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         base conduit containers hspec HUnit monad-control monad-logger
-         persistent persistent-sqlite persistent-template QuickCheck
-         resourcet text transformers
-       ];
-       homepage = "https://github.com/prowdsponsor/esqueleto";
-       description = "Type-safe EDSL for SQL queries on persistent backends";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "esqueleto" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, conduit, containers
      , hspec, HUnit, monad-control, monad-logger, persistent
@@ -59977,6 +60060,36 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "exference" = callPackage
+    ({ mkDerivation, base, base-orphans, bifunctors, containers
+     , data-pprint, deepseq, deepseq-generics, directory, either
+     , hashable, haskell-src-exts, hood, lens, mmorph, mtl, multistate
+     , parsec, pqueue, pretty, process, safe, split, template-haskell
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "exference";
+       version = "1.6.0.0";
+       sha256 = "303f1deaba594489712351b969b6bc93dc27272b03848b28e44cfe61b5a5cad2";
+       revision = "3";
+       editedCabalFile = "e3f9d32a394fc1790ce74c5a9ba629f97dbd3a11796d4ac1e5f642f76802cc56";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base-orphans bifunctors containers deepseq deepseq-generics
+         directory either hashable haskell-src-exts hood lens mmorph mtl
+         multistate parsec pqueue pretty process safe split template-haskell
+         transformers unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         base containers data-pprint deepseq either haskell-src-exts hood
+         mtl multistate process transformers
+       ];
+       homepage = "https://github.com/lspitzner/exference";
+       description = "Tool to search/generate (haskell) expressions with a given type";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "exhaustive" = callPackage
     ({ mkDerivation, base, generics-sop, template-haskell, transformers
      }:
@@ -61040,6 +61153,25 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "fasta_0_10_4_2" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers, foldl
+     , lens, parsec, pipes, pipes-attoparsec, pipes-bytestring
+     , pipes-group, pipes-text, split, text
+     }:
+     mkDerivation {
+       pname = "fasta";
+       version = "0.10.4.2";
+       sha256 = "2b760dfd5029dee94d56010f8125f4317d6fa675a84817c352311d308d1897be";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers foldl lens parsec pipes
+         pipes-attoparsec pipes-bytestring pipes-group pipes-text split text
+       ];
+       homepage = "https://github.com/GregorySchwartz/fasta";
+       description = "A simple, mindless parser for fasta files";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fastbayes" = callPackage
     ({ mkDerivation, base, hmatrix, vector }:
      mkDerivation {
@@ -62376,8 +62508,8 @@ self: {
      }:
      mkDerivation {
        pname = "filestore";
-       version = "0.6.3";
-       sha256 = "b1f3ea70bdecb17281c65b14c8f5c6c52e189a30ad102d87a8f9c2fe08d92d57";
+       version = "0.6.3.1";
+       sha256 = "816f0db22291c7ac719db4b342e8ecc42c8ab749374cc70790887a6d025ad8de";
        libraryHaskellDepends = [
          base bytestring containers Diff directory filepath old-locale
          parsec process split time utf8-string xml
@@ -63644,8 +63776,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.0.7";
-       sha256 = "428add7568eea3e7b813b7ae89d824d7a97e8810662aa5371357b17f630dccde";
+       version = "0.5.0.8";
+       sha256 = "1be849d2dbf73a7ad02d0945ae7eb834085ed4a192dcdf5733c2fd764d308adb";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal ];
@@ -65701,14 +65833,14 @@ self: {
 
   "ftp-client" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, connection
-     , exceptions, network, transformers
+     , containers, exceptions, network, transformers
      }:
      mkDerivation {
        pname = "ftp-client";
-       version = "0.4.0.0";
-       sha256 = "6742576a894fbebe30a4f4b55d78baf03ae0e0d068d9704d7d41c33077bd93c7";
+       version = "0.4.0.1";
+       sha256 = "c4ae91a103e3b3288a803831d55e8ddde1f2c6946d3fc3ec27bfde8995f71b4c";
        libraryHaskellDepends = [
-         attoparsec base bytestring connection exceptions network
+         attoparsec base bytestring connection containers exceptions network
          transformers
        ];
        testHaskellDepends = [ base ];
@@ -65718,15 +65850,16 @@ self: {
      }) {};
 
   "ftp-client-conduit" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, connection, exceptions
-     , ftp-client, ftp-clientconduit, resourcet
+    ({ mkDerivation, base, bytestring, conduit-combinators, connection
+     , exceptions, ftp-client, ftp-clientconduit, resourcet
      }:
      mkDerivation {
        pname = "ftp-client-conduit";
-       version = "0.4.0.0";
-       sha256 = "cdfea17aa55aaceba29f627b24bc6f0d6c350578e0675e3ec8161bafbe76004f";
+       version = "0.4.0.1";
+       sha256 = "baabf54a382463cf91a147f9553edff86baf9b3554e69f2f3e612ea37c8e399f";
        libraryHaskellDepends = [
-         base bytestring conduit connection exceptions ftp-client resourcet
+         base bytestring conduit-combinators connection exceptions
+         ftp-client resourcet
        ];
        testHaskellDepends = [ base ftp-clientconduit ];
        homepage = "https://github.com/mr/ftp-client";
@@ -67420,10 +67553,8 @@ self: {
     ({ mkDerivation, base, hspec, QuickCheck, validity }:
      mkDerivation {
        pname = "genvalidity";
-       version = "0.3.0.0";
-       sha256 = "22c279c1409fbb0b9c9d709873c0639f555c34c8919cd481e2eb6fcab729ccff";
-       revision = "1";
-       editedCabalFile = "fbaf3c842ce3316d3fef10d69dcf9a0279aa0d35be0f420da4749c6cdca1528a";
+       version = "0.3.1.0";
+       sha256 = "fd79841970e8d29a204e8cdf540478760f2a488bde21583668a3e7d8526f588a";
        libraryHaskellDepends = [ base QuickCheck validity ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/NorfairKing/validity#readme";
@@ -67452,36 +67583,40 @@ self: {
      }) {};
 
   "genvalidity-hspec" = callPackage
-    ({ mkDerivation, base, doctest, genvalidity, hspec, QuickCheck
-     , validity
+    ({ mkDerivation, base, doctest, genvalidity, hspec, hspec-core
+     , QuickCheck, validity
      }:
      mkDerivation {
        pname = "genvalidity-hspec";
-       version = "0.3.0.0";
-       sha256 = "0d25376307b9bbbf8a7d438f0e9252e86f1f3227c356a2979f002ebb711d612d";
-       revision = "2";
-       editedCabalFile = "dc8f7ce63cb185436f09ee5ff581a6b6430576a9e1053849321cd4d4ad653719";
+       version = "0.3.1.0";
+       sha256 = "abead88444f51c39f59cf2b959ad0d9532f4b58b87cb9f53b6e6c0bc6f62ef5d";
        libraryHaskellDepends = [
          base genvalidity hspec QuickCheck validity
        ];
-       testHaskellDepends = [ base doctest genvalidity hspec ];
+       testHaskellDepends = [
+         base doctest genvalidity hspec hspec-core QuickCheck
+       ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Standard spec's for GenValidity instances";
        license = stdenv.lib.licenses.mit;
      }) {};
 
   "genvalidity-hspec-aeson" = callPackage
-    ({ mkDerivation, aeson, base, deepseq, doctest, genvalidity
-     , genvalidity-hspec, hspec, QuickCheck
+    ({ mkDerivation, aeson, base, bytestring, deepseq, doctest
+     , genvalidity, genvalidity-hspec, genvalidity-text, hspec
+     , QuickCheck, text
      }:
      mkDerivation {
        pname = "genvalidity-hspec-aeson";
-       version = "0.0.0.0";
-       sha256 = "c33756346e6435553f938caa6ed0886852495ebc2cd458badd35d87d76fd00de";
+       version = "0.0.1.0";
+       sha256 = "58da64350fb137c8fae3a62450fe541adf66ddc4f2d42791350cb6085ac1b2b0";
        libraryHaskellDepends = [
-         aeson base deepseq genvalidity genvalidity-hspec hspec QuickCheck
+         aeson base bytestring deepseq genvalidity genvalidity-hspec hspec
+         QuickCheck
+       ];
+       testHaskellDepends = [
+         aeson base doctest genvalidity genvalidity-text hspec text
        ];
-       testHaskellDepends = [ base doctest genvalidity hspec ];
        homepage = "http://cs-syd.eu";
        description = "Standard spec's for aeson-related instances";
        license = stdenv.lib.licenses.mit;
@@ -67523,23 +67658,40 @@ self: {
      }) {};
 
   "genvalidity-text" = callPackage
-    ({ mkDerivation, array, base, genvalidity, hspec, QuickCheck, text
-     , validity, validity-text
+    ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec
+     , QuickCheck, text, validity, validity-text
      }:
      mkDerivation {
        pname = "genvalidity-text";
-       version = "0.2.0.0";
-       sha256 = "93f5a28f1dcb08bbfd65c58764ee73df2cd49b74150b5e4657313048ab08bf0b";
+       version = "0.3.0.0";
+       sha256 = "ac533aec5b7d845596d5f0caef8fa2c931a8ba9fee17650e0141df4a6baacd0b";
        libraryHaskellDepends = [
          array base genvalidity QuickCheck text validity validity-text
        ];
-       testHaskellDepends = [ base genvalidity hspec QuickCheck text ];
+       testHaskellDepends = [
+         base genvalidity genvalidity-hspec hspec QuickCheck text
+       ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for Text";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "genvalidity-time" = callPackage
+    ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec, time
+     , validity-time
+     }:
+     mkDerivation {
+       pname = "genvalidity-time";
+       version = "0.0.0.0";
+       sha256 = "6f0a0872e4163afbe03ebdca19cc3411ba60cfc8ff44db03cd06c66c4b974e3e";
+       libraryHaskellDepends = [ base genvalidity time validity-time ];
+       testHaskellDepends = [ base genvalidity-hspec hspec time ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "GenValidity support for time";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "geo-resolver" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
      , bytestring, http-conduit, http-types, HUnit, QuickCheck
@@ -67661,8 +67813,8 @@ self: {
      }:
      mkDerivation {
        pname = "geoip2";
-       version = "0.2.1.1";
-       sha256 = "74d432e6abbfb82187272a3e35505cdc0714c4dc2b5c3fac730cb4450e32cd0e";
+       version = "0.2.2.0";
+       sha256 = "04a29f729f3cbfd8bf1c5f041c0412a95a8c496b5215896e9393a6f5f84bd03e";
        libraryHaskellDepends = [
          base bytestring cereal containers iproute mmap reinterpret-cast
          text
@@ -68021,6 +68173,8 @@ self: {
        pname = "ghc-events-analyze";
        version = "0.2.4";
        sha256 = "6161f5491a34252289c8265c7c48c5a70c1e2a69ffbfe64800cfdc3a8d3d4dd9";
+       revision = "1";
+       editedCabalFile = "3224314053b1774c18a19a558be964916f87e146f7ce47970a5de65a1bc962bc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -68387,6 +68541,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-prof_1_4_0" = callPackage
+    ({ mkDerivation, attoparsec, base, containers, directory, filepath
+     , process, scientific, tasty, tasty-hunit, temporary, text, time
+     }:
+     mkDerivation {
+       pname = "ghc-prof";
+       version = "1.4.0";
+       sha256 = "2ab282b118684c30cf10f6b69aa362dacaf274a73b7e23b668c36d6830ce4253";
+       libraryHaskellDepends = [
+         attoparsec base containers scientific text time
+       ];
+       testHaskellDepends = [
+         attoparsec base containers directory filepath process tasty
+         tasty-hunit temporary text
+       ];
+       homepage = "https://github.com/maoe/ghc-prof";
+       description = "Library for parsing GHC time and allocation profiling reports";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-prof-flamegraph" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -69812,8 +69987,8 @@ self: {
      }:
      mkDerivation {
        pname = "git";
-       version = "0.1";
-       sha256 = "846907115b7b81dd046c78581d4709b403e307046f1ab4680c7ac0475130bef3";
+       version = "0.2.0";
+       sha256 = "d773dcfdd34b2b4ca34a1e84fac7c80f44c0ea0f89378ab3d161683c8acd8ea8";
        libraryHaskellDepends = [
          base byteable bytestring containers cryptonite hourglass memory mtl
          patience random system-fileio system-filepath unix-compat
@@ -69823,7 +69998,7 @@ self: {
          base bytedump bytestring hourglass tasty tasty-quickcheck
        ];
        doCheck = false;
-       homepage = "https://github.com/vincenthz/hit";
+       homepage = "https://github.com/vincenthz/hs-git";
        description = "Git operations in haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69870,8 +70045,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20170101";
-       sha256 = "5fbf88652a84278275d9d4bec083189f590b045e23a73bfe8d395c3e356e3f53";
+       version = "6.20170214";
+       sha256 = "d2f5a5bfa8077f417a8c0fee556571f498a9fbdabb99cdeed326df0a1f042e4b";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -70474,8 +70649,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitit";
-       version = "0.12.2";
-       sha256 = "160a928d992847823ab11982fa6465a4d80e59ce2a45e54e8a5e1838aba22b78";
+       version = "0.12.2.1";
+       sha256 = "15114e589f90bb4361fda3cbaec23c82c2a765f4e09debc93b2b46ac698053f4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -70575,6 +70750,8 @@ self: {
        pname = "gitlib-libgit2";
        version = "3.1.1";
        sha256 = "fc2806ebc1bb51f5043a0d5091c5045be40bf82cae3296213b353507b8c868bb";
+       revision = "1";
+       editedCabalFile = "15ea81db4b514f97392188994df86421d9a8cb76cfb0558de3fc9ba60903a16c";
        libraryHaskellDepends = [
          base bytestring conduit conduit-combinators containers directory
          exceptions fast-logger filepath gitlib hlibgit2 lifted-async
@@ -70930,6 +71107,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "glazier_0_8_0_0" = callPackage
+    ({ mkDerivation, base, lens, mmorph, mtl, profunctors
+     , semigroupoids, transformers
+     }:
+     mkDerivation {
+       pname = "glazier";
+       version = "0.8.0.0";
+       sha256 = "758345dee0b3401091ce52ce8e91332dd763bcfba112e211166ee7e7f69efa9c";
+       libraryHaskellDepends = [
+         base lens mmorph mtl profunctors semigroupoids transformers
+       ];
+       homepage = "https://github.com/louispan/glazier#readme";
+       description = "Composable widgets framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "glazier-pipes" = callPackage
     ({ mkDerivation, base, glazier, lens, mmorph, mtl, pipes
      , pipes-concurrency, pipes-misc, stm, stm-extras, transformers
@@ -71929,6 +72123,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-adexchange-buyer_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-adexchange-buyer";
+       version = "0.2.0";
+       sha256 = "3d873f33e21113ba0fb37d23596cdc12afcb5945996b11ad9f80c7b584c73cf4";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Ad Exchange Buyer SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-adexchange-seller" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71941,6 +72148,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-adexchange-seller_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-adexchange-seller";
+       version = "0.2.0";
+       sha256 = "47de32da4902d6b04b97986bf30d604422946866f6150163f117584da79ef3be";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Ad Exchange Seller SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-admin-datatransfer" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71978,6 +72198,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-admin-directory_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-admin-directory";
+       version = "0.2.0";
+       sha256 = "df04ced257650903e50ab444c50f4e4e29e33f37a6a54b4995d4e3c3cdb20772";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Admin Directory SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-admin-emailmigration" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71990,6 +72223,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-admin-emailmigration_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-admin-emailmigration";
+       version = "0.2.0";
+       sha256 = "b37267faa6cae7e9e911f0952acbaf558fc0626da4650299141e84f28f4b58d2";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Email Migration API v2 SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-admin-reports" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72014,6 +72260,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-adsense_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-adsense";
+       version = "0.2.0";
+       sha256 = "96fd93139c8ba6746dc42df54a42a7288d8c874b4be973216cfb16b195a4db4c";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google AdSense Management SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-adsense-host" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72076,6 +72335,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-analytics_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-analytics";
+       version = "0.2.0";
+       sha256 = "3854fc9b147867dcbdc5517fe2616936bf2dd2699f75463976113c031af429da";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Analytics SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-android-enterprise" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72088,6 +72360,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-android-enterprise_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-android-enterprise";
+       version = "0.2.0";
+       sha256 = "e1761fcfaea7541e219180c6cbad01663b96c6340c58cf059361ea3daf45d5ea";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Play EMM SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-android-publisher" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72100,6 +72385,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-android-publisher_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-android-publisher";
+       version = "0.2.0";
+       sha256 = "c27db46fc5a29f077a79d6fac7af161e891d9931554aed4e3cfa5a18cc380da3";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Play Developer SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-appengine" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72112,6 +72410,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-appengine_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-appengine";
+       version = "0.2.0";
+       sha256 = "f59ca638940b39c3b4f1a1a7c5d1951ff53ba0ba29d0b9cf8e4e816fa4d235e5";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google App Engine Admin SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-apps-activity" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72124,6 +72435,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-apps-activity_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-apps-activity";
+       version = "0.2.0";
+       sha256 = "b5cb8d5a54165e3bcda3a27ce284bd93bc0b0792b344c6595079df6de4844988";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Apps Activity SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-apps-calendar" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72161,6 +72485,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-apps-licensing_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-apps-licensing";
+       version = "0.2.0";
+       sha256 = "1d568798f981d73a4114a58a195ceef17eba6166b07a15036d131c5d8ac46a86";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Enterprise License Manager SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-apps-reseller" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72173,6 +72510,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-apps-reseller_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-apps-reseller";
+       version = "0.2.0";
+       sha256 = "97cfd83d01034d0d4c6b8dbe6203da51d0f9c33e3690a38cc0688bdaa41ef60b";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Enterprise Apps Reseller SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-apps-tasks" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72185,6 +72535,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-apps-tasks_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-apps-tasks";
+       version = "0.2.0";
+       sha256 = "5090d963d887943fc3723396355f746bd84f05df294c04e3c4a1d01a8b84179d";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Tasks SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-appstate" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72197,6 +72560,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-appstate_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-appstate";
+       version = "0.2.0";
+       sha256 = "0fcf974036e78e6fb429702a2485ae7c7613b89380c26044e18ce5839658c4ae";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google App State SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-autoscaler" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72209,6 +72585,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-autoscaler_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-autoscaler";
+       version = "0.2.0";
+       sha256 = "99ddf55dc78ecd3b4745259615016b677d0343b31d7c9adc9fbba1d1eb34779c";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Compute Engine Autoscaler SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-bigquery" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72221,6 +72610,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-bigquery_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-bigquery";
+       version = "0.2.0";
+       sha256 = "c3ce3a5677375f6ead59d90fa4589bf1d42ee0dc3ceeda25c0700551918e98be";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google BigQuery SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-billing" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72258,6 +72660,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-blogger_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-blogger";
+       version = "0.2.0";
+       sha256 = "4a65b159bb5d7f55dee7bdcb7aa594c0f7de1014bbe01f8796ed06b400bb5f04";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Blogger SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-books" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72270,6 +72685,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-books_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-books";
+       version = "0.2.0";
+       sha256 = "bd0b528943aeb018809ba7309e5c3b45061b90101f695a050b9cae6ac876e30c";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Books SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-civicinfo" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72332,6 +72760,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-cloudmonitoring_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-cloudmonitoring";
+       version = "0.2.0";
+       sha256 = "e2567828a7e50ab4eaef10b82cfea1b97476dc44388cb5ba8b2ca56cf1530790";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Monitoring SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-cloudtrace" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72344,6 +72785,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-cloudtrace_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-cloudtrace";
+       version = "0.2.0";
+       sha256 = "3799a1febfe93fce7040eda7e870c6d22bed46b9c23820f8bbbc2157fb65542b";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Trace SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-compute" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72356,6 +72810,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-compute_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-compute";
+       version = "0.2.0";
+       sha256 = "0264743c5b76e8c1c4c522f2d560de91618353594a45647c9b330db97b9adf62";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Compute Engine SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-container" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72419,7 +72886,7 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-core_0_2_0" = callPackage
+  "gogol-core_0_2_0_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
      , case-insensitive, conduit, dlist, exceptions, hashable
      , http-api-data, http-client, http-media, http-types, lens
@@ -72428,8 +72895,8 @@ self: {
      }:
      mkDerivation {
        pname = "gogol-core";
-       version = "0.2.0";
-       sha256 = "a629f7bce87624d0ac1314c8aa080ec1d5488f809864031eab716a51167244ab";
+       version = "0.2.0.1";
+       sha256 = "62e65a36ec74bca9599741c27f0f9b7432b5db362e1670a6bff5c90468112f0e";
        libraryHaskellDepends = [
          aeson attoparsec base bifunctors bytestring case-insensitive
          conduit dlist exceptions hashable http-api-data http-client
@@ -72455,6 +72922,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-customsearch_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-customsearch";
+       version = "0.2.0";
+       sha256 = "c96cdef0a652a7859bf5d8dbc8d6c3c05339d4be28d6f34454b337186af15e72";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google CustomSearch SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-dataflow" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72467,6 +72947,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-dataflow_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-dataflow";
+       version = "0.2.0";
+       sha256 = "45590531284533737405e6cfb7d4ee00c29c262a25926a86dcb0089f81bc12ff";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Dataflow SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-dataproc" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72479,6 +72972,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-dataproc_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-dataproc";
+       version = "0.2.0";
+       sha256 = "7b79a0dee033c647982e6883ac0cc57475624a7a8ca86ec3a5bd44e073ea0533";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Dataproc SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-datastore" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72491,6 +72997,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-datastore_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-datastore";
+       version = "0.2.0";
+       sha256 = "5cd4a693a90ea2cae406aace00a441398071ae41f61b194562f37eaf4fec3857";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Datastore SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-debugger" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72528,6 +73047,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-deploymentmanager_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-deploymentmanager";
+       version = "0.2.0";
+       sha256 = "5dda38584d10a85f90aff0a1d8636c8f1e5b2e7a78a332b41352b1b2a565ac03";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Deployment Manager SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-dfareporting" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72540,6 +73072,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-dfareporting_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-dfareporting";
+       version = "0.2.0";
+       sha256 = "9295a5968c696d814fd77f099fbf1fd2dd89357582ae2c2cf8ddeb5b40502c24";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google DCM/DFA Reporting And Trafficking SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-discovery" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72552,6 +73097,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-discovery_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-discovery";
+       version = "0.2.0";
+       sha256 = "556992c0da8ad27206211845ab46fbf7dffdad55a9c1ca4274da0df672a896c4";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google APIs Discovery Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-dns" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72564,6 +73122,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-dns_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-dns";
+       version = "0.2.0";
+       sha256 = "bf24d5a57f7d316a49b3b413ba4c9aa94a164a009f3911f86be19386b204be87";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud DNS SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-doubleclick-bids" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72601,6 +73172,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-doubleclick-search_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-doubleclick-search";
+       version = "0.2.0";
+       sha256 = "8ecfa7547c2d08a2d8d39389c4a889bdc32eaf63ae4b80ec2b1be36f969887cb";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google DoubleClick Search SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-drive" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72613,12 +73197,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-drive_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-drive";
+       version = "0.2.0";
+       sha256 = "dc68e0331e441b6b9488fbc29b5864b9955dc3978c7092340870191a8f86cc6c";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Drive SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-firebase-dynamiclinks" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-firebase-dynamiclinks";
-       version = "0.1.1";
-       sha256 = "e98604b85e66579ee99073ed335032e7983db5948f2a8c427be78b00b96ab24f";
+       version = "0.2.0";
+       sha256 = "8ba21d6d26785e0c43493ba2a035cc3d5eb07f663dff57c166113580a8f1161e";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Firebase Dynamic Links SDK";
@@ -72638,6 +73235,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-firebase-rules_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-firebase-rules";
+       version = "0.2.0";
+       sha256 = "96ba97607341e89c5ca376f6ab77076b9caae896f91c219711ba9e97f2a8bd43";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Firebase Rules SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-fitness" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72650,6 +73260,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-fitness_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-fitness";
+       version = "0.2.0";
+       sha256 = "bf8f4136d3cec3e34057731ca02b1ad97e9a6bb15e72ed89a1eb072cca433d8c";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Fitness SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-fonts" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72662,6 +73285,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-fonts_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-fonts";
+       version = "0.2.0";
+       sha256 = "b4a7ae314ea71acaecb7a60463230d48213b5f4d41f6e82962064bab39309f06";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Fonts Developer SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-freebasesearch" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72674,6 +73310,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-freebasesearch_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-freebasesearch";
+       version = "0.2.0";
+       sha256 = "b37d8631971615d6e04c1a3b46386336462b3bd63d3ea4e3ab9ba2130398c45f";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Freebase Search SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-fusiontables" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72711,6 +73360,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-games_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-games";
+       version = "0.2.0";
+       sha256 = "caab93ef1124477ee354bdaf9d9b193c48261cc0adba82d8aa712d4c7b6c7ff5";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Play Game Services SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-games-configuration" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72723,6 +73385,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-games-configuration_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-games-configuration";
+       version = "0.2.0";
+       sha256 = "5df2b8b8610e31aeea29f67793377b310aaf16ecb8b18fd4e42a23750ae0c6a5";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Play Game Services Publishing SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-games-management" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72735,6 +73410,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-games-management_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-games-management";
+       version = "0.2.0";
+       sha256 = "dfe5b07bd33e2f7997c82e6ffbd01427ad02bbc2a225ac4629c480ce0d1f00c6";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Play Game Services Management SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-genomics" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72747,6 +73435,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-genomics_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-genomics";
+       version = "0.2.0";
+       sha256 = "10ef615601475e3baec18567b442fdca5a239f1caf67de66f5703cd00eee1b56";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Genomics SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-gmail" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72759,6 +73460,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-gmail_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-gmail";
+       version = "0.2.0";
+       sha256 = "ab972260ba64d358dbb71200b438b042c5549e75a110f2cdcf15f5be332afaf5";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Gmail SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-groups-migration" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72771,6 +73485,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-groups-migration_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-groups-migration";
+       version = "0.2.0";
+       sha256 = "933e7453e808e3878f38b0263bfd5b48b698284b370b951a99a6dd858bbeabe2";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Groups Migration SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-groups-settings" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72800,8 +73527,8 @@ self: {
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-iam";
-       version = "0.1.1";
-       sha256 = "ec66ff6403ce2b59308703c8dbc47b9609d1a9029cae9b77c2137be336c783b9";
+       version = "0.2.0";
+       sha256 = "c793665c0cf11fbf609cbc22399b84dd060411524210544ec848eb73f2136f58";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Identity and Access Management (IAM) SDK";
@@ -72821,6 +73548,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-identity-toolkit_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-identity-toolkit";
+       version = "0.2.0";
+       sha256 = "835f936b942a60c3d4290cdbb66d7f8ea36697c8a8192ea7b4613ccc194cbc94";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Identity Toolkit SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-kgsearch" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72833,6 +73573,31 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-kgsearch_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-kgsearch";
+       version = "0.2.0";
+       sha256 = "e693a96569b16252ca14a7d684e51652b58d691456ab008b74c4276c29cf1a22";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Knowledge Graph Search SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "gogol-language" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-language";
+       version = "0.2.0";
+       sha256 = "88233a59c4f1f6319be39332a231aa823a262580b442f875e8e358698dc18fcf";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Natural Language SDK";
+       license = "unknown";
+     }) {};
+
   "gogol-latencytest" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72845,6 +73610,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-latencytest_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-latencytest";
+       version = "0.2.0";
+       sha256 = "8ae96a0d45874f2bd8733d2e7194ba875e09bf081a6425ff943e6ffff367d894";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Network Performance Monitoring SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-logging" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72857,6 +73635,31 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-logging_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-logging";
+       version = "0.2.0";
+       sha256 = "cd2d8c6d2f72f27fd8ac911ebbdcb8acfad84597036a5cf81f5857cd6985dfad";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Stackdriver Logging SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "gogol-manufacturers" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-manufacturers";
+       version = "0.2.0";
+       sha256 = "7d7001d2593365a23ab809a815934e3cf2327f1a40d5597a2fc012bd87df0f36";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Manufacturer Center SDK";
+       license = "unknown";
+     }) {};
+
   "gogol-maps-coordinate" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72894,6 +73697,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-maps-engine_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-maps-engine";
+       version = "0.2.0";
+       sha256 = "aafe4135dcaf7329f86fe80f73b419619765e8ea30db249a912db62c9f0bfb1f";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Maps Engine SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-mirror" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72906,12 +73722,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-mirror_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-mirror";
+       version = "0.2.0";
+       sha256 = "0c60337f67257069096fc1187a48569a3b370d705f80b40c3c7dfcc0f701408b";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Mirror SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-ml" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-ml";
-       version = "0.1.1";
-       sha256 = "bee43d94edd81a53f387bfcf76c6679d91c36bfe50e11dd26f8bd047c758709c";
+       version = "0.2.0";
+       sha256 = "88202ed828ba87713a522423c2b29add4f7f9fcb9de52101bd5deabd5a2ab44c";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Machine Learning SDK";
@@ -72931,6 +73760,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-monitoring_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-monitoring";
+       version = "0.2.0";
+       sha256 = "e0f505881e97c1fa3d85e8eb12a827928ad8c253c6689ba436ab6fa2886cbf21";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Stackdriver Monitoring SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-oauth2" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72943,6 +73785,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-oauth2_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-oauth2";
+       version = "0.2.0";
+       sha256 = "7bd97bebf58e0aac97e84f86bad65d077bec7f8ead67b2b0518e9d0173284a8f";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google OAuth2 SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-pagespeed" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72955,6 +73810,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-pagespeed_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-pagespeed";
+       version = "0.2.0";
+       sha256 = "e5033e168843a2c821d22cf94a8e5402b0908335bdef6baa626a8fe27857dc10";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google PageSpeed Insights SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-partners" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72992,6 +73860,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-people_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-people";
+       version = "0.2.0";
+       sha256 = "18b1c3d8b916acd8e53c618c00f7e6f06dd310840a7a2f242f271635409bd9bb";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google People SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-play-moviespartner" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73004,6 +73885,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-play-moviespartner_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-play-moviespartner";
+       version = "0.2.0";
+       sha256 = "397206cf5681131cdd97191b9b98151c468923c6df6df73d8391e600036d8b44";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Play Movies Partner SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-plus" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73016,6 +73910,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-plus_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-plus";
+       version = "0.2.0";
+       sha256 = "32f64fd22d7a2290fe7ef29edf2a982cfe2c76fb9817d068733837bdca48d8da";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google + SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-plus-domains" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73053,6 +73960,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-prediction_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-prediction";
+       version = "0.2.0";
+       sha256 = "91c34600473b3e09b0e6a0bcf151b4e7d5120a8d0ad7fd6a225cb9312f2e8ba7";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Prediction SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-proximitybeacon" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73090,6 +74010,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-pubsub_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-pubsub";
+       version = "0.2.0";
+       sha256 = "643868bfe3e341d81c576e6a274676d5fda86ad542dc8a8021f82570a51a5ed3";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Pub/Sub SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-qpxexpress" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73102,6 +74035,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-qpxexpress_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-qpxexpress";
+       version = "0.2.0";
+       sha256 = "a62fbb56b641032b33b55d26235df766db1e2cca27f307054fcd0e48d5bb7813";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google QPX Express SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-replicapool" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73114,6 +74060,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-replicapool_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-replicapool";
+       version = "0.2.0";
+       sha256 = "82331105facb5afe1d86fdaa1dfd8da0c17ea76b4b5af559e1fb8dfda8ddc245";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Compute Engine Instance Group Manager SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-replicapool-updater" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73126,6 +74085,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-replicapool-updater_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-replicapool-updater";
+       version = "0.2.0";
+       sha256 = "0d35642fdc7d5c319501bd091e1225b516249ef0f082290e8b1750c44c9037b8";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Compute Engine Instance Group Updater SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-resourcemanager" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73163,6 +74135,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-resourceviews_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-resourceviews";
+       version = "0.2.0";
+       sha256 = "fb8024792a51e8c7a2d4a93edd3b2d4d8d6b03d826ffdadcbfb26cd4d07bc171";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Compute Engine Instance Groups SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-runtimeconfig" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73201,12 +74186,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-script_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-script";
+       version = "0.2.0";
+       sha256 = "e2572e207591d10c8a7eaff165ccb54286ca2b041c4ea2323d010c186ada47cb";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Apps Script Execution SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-servicecontrol" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-servicecontrol";
-       version = "0.1.1";
-       sha256 = "1f8da851a8d5056c67fd9f3fdba2269dde07c1ef65572aeb77a74194066b8e77";
+       version = "0.2.0";
+       sha256 = "0f94288509755891bb1195911a1cb367b1a9304ff1acb30d6713c5d776fb3c27";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Service Control SDK";
@@ -73218,8 +74216,8 @@ self: {
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-servicemanagement";
-       version = "0.1.1";
-       sha256 = "4a8ed16569b5e342181a91a07479da3fa50e3c00ab12c4dc27313455fd64c4ac";
+       version = "0.2.0";
+       sha256 = "0b0e654df7bf54672ff8b34feff48208a07ec8215c69f7665946f4b3386a762d";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Service Management SDK";
@@ -73239,6 +74237,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-sheets_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-sheets";
+       version = "0.2.0";
+       sha256 = "8494db34d160118c23391864c3d3602179313cd81a874fd2c19059309b6a37e0";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Sheets SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-shopping-content" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73251,6 +74262,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-shopping-content_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-shopping-content";
+       version = "0.2.0";
+       sha256 = "f64953dd9618c5dbf1904df08b4211afb1e06109cf053e3e1244e3b167645662";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Content API for Shopping SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-siteverification" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73263,6 +74287,31 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-siteverification_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-siteverification";
+       version = "0.2.0";
+       sha256 = "1f743419a85baafdfa1cbbea01f6f1cfbcf23ae95943517166ae7518cbfc0a32";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Site Verification SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "gogol-slides" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-slides";
+       version = "0.2.0";
+       sha256 = "e51390bc85a54109473bf24b7434f0f7dd5ec189cc9b76a6201f9a26c6d4ac4c";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Slides SDK";
+       license = "unknown";
+     }) {};
+
   "gogol-spectrum" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73275,6 +74324,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-spectrum_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-spectrum";
+       version = "0.2.0";
+       sha256 = "268d3a60b2f05702ff63fbaf56d485e36089691c83e1a2a491419e3b547b6f7e";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Spectrum Database SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-sqladmin" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73287,6 +74349,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-sqladmin_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-sqladmin";
+       version = "0.2.0";
+       sha256 = "d7cb8593629a7694b12ef4e1249158883e4334d8d1d68ef8612f987aa1dfe153";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud SQL Administration SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-storage" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73349,6 +74424,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-tagmanager_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-tagmanager";
+       version = "0.2.0";
+       sha256 = "fc589362f09adf19a1b4e1b2609d4787eb7df73a27ff6f433fecb4614bd0543f";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Tag Manager SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-taskqueue" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73386,6 +74474,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-translate_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-translate";
+       version = "0.2.0";
+       sha256 = "b965db2484daf4e5d91594d5e7eed8aa020c99ae1512925718c23406a55e78cc";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Translate SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-urlshortener" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73398,6 +74499,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-urlshortener_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-urlshortener";
+       version = "0.2.0";
+       sha256 = "6bb29a4f08babe57deff1ce6d4ee045266cdfdc91ace37d821962801717e8672";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google URL Shortener SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-useraccounts" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73460,6 +74574,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-webmaster-tools_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-webmaster-tools";
+       version = "0.2.0";
+       sha256 = "00633481f3965ecaf2a3d6b56e4d67d8d13bb901b9023d613b4c527f7a5da04b";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Search Console SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-youtube" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73472,6 +74599,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-youtube_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-youtube";
+       version = "0.2.0";
+       sha256 = "425ead26d5096dc3fff0333971b79e7cd4b2ee49b52efdb1609a5ca557b29005";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google YouTube Data SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-youtube-analytics" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73484,6 +74624,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-youtube-analytics_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-youtube-analytics";
+       version = "0.2.0";
+       sha256 = "0e888dce3cba650909e577641d7e60b19e521db3c48b36d83cf7f0e8300a451b";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google YouTube Analytics SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-youtube-reporting" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73496,6 +74649,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-youtube-reporting_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-youtube-reporting";
+       version = "0.2.0";
+       sha256 = "f116487fb543dc596485ce07bf9b17f3867197871ff434a9de68414706a92d39";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google YouTube Reporting SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gooey" = callPackage
     ({ mkDerivation, base, renderable, transformers, varying }:
      mkDerivation {
@@ -74112,8 +75278,8 @@ self: {
      }:
      mkDerivation {
        pname = "graflog";
-       version = "6.1.4";
-       sha256 = "d798087880663d3edd16f4ff6f9503b6f40917178aa86e19613dfba9811ed824";
+       version = "6.1.5";
+       sha256 = "8e784641738220a999963e36b9e1b10b88a767bd79763481da5e2f47e4f37ddd";
        libraryHaskellDepends = [
          aeson base bytestring containers mtl text text-conversions
        ];
@@ -74955,12 +76121,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "gridbounds" = callPackage
+    ({ mkDerivation, base, earclipper, gjk, gridbox, hspec }:
+     mkDerivation {
+       pname = "gridbounds";
+       version = "0.0.0.1";
+       sha256 = "100a017e6286ec0cc738099982643ea0e0016076d2d48e11f71a061da1641eea";
+       libraryHaskellDepends = [ base earclipper gjk gridbox ];
+       testHaskellDepends = [ base earclipper gjk gridbox hspec ];
+       homepage = "https://github.com/zaidan/gridbounds#readme";
+       description = "Collision detection for GridBox";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "gridbox" = callPackage
     ({ mkDerivation, base, hspec }:
      mkDerivation {
        pname = "gridbox";
-       version = "0.2.0.0";
-       sha256 = "0f035d7cf07e87a46037e5f52e7742667b58a8e049d1a1211b95aaa8731eb580";
+       version = "0.3.0.0";
+       sha256 = "912792b8f7df3d343f68caafe4bae91ef138686073c80a7f9486cbdb77a0aa45";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/zaidan/gridbox#readme";
@@ -77800,6 +78979,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hailgun_0_4_1_2" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, email-validate
+     , exceptions, filepath, http-client, http-client-tls, http-types
+     , tagsoup, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "hailgun";
+       version = "0.4.1.2";
+       sha256 = "f0b8e11e2a09d0d737620ed46e8029c5679cfe392c47df4be5ee3ba63a114ff1";
+       libraryHaskellDepends = [
+         aeson base bytestring email-validate exceptions filepath
+         http-client http-client-tls http-types tagsoup text time
+         transformers
+       ];
+       description = "Mailgun REST api interface for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hailgun-send" = callPackage
     ({ mkDerivation, base, bytestring, configurator, hailgun, text }:
      mkDerivation {
@@ -89978,6 +91176,8 @@ self: {
        pname = "horname";
        version = "0.1.3.0";
        sha256 = "e9a6cfb0ba87f063f04a7273d476b200905625ce60b00d87c8995332b1b7f218";
+       revision = "1";
+       editedCabalFile = "94e798feada4d4014ee1438672fe57e6181f1b9b64bc92858644037a77678f81";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90277,36 +91477,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hpack_0_15_0" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, base-compat, containers
-     , deepseq, directory, filepath, Glob, hspec, interpolate, mockery
-     , QuickCheck, temporary, text, unordered-containers, yaml
-     }:
-     mkDerivation {
-       pname = "hpack";
-       version = "0.15.0";
-       sha256 = "72a39a5d7d8dc2e94a37f75642f7e491ae9d560070b07c5c17e9ced6e3cbab63";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base base-compat containers deepseq directory filepath Glob
-         text unordered-containers yaml
-       ];
-       executableHaskellDepends = [
-         aeson base base-compat containers deepseq directory filepath Glob
-         text unordered-containers yaml
-       ];
-       testHaskellDepends = [
-         aeson aeson-qq base base-compat containers deepseq directory
-         filepath Glob hspec interpolate mockery QuickCheck temporary text
-         unordered-containers yaml
-       ];
-       homepage = "https://github.com/sol/hpack#readme";
-       description = "An alternative format for Haskell packages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "hpack" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring
      , containers, deepseq, directory, filepath, Glob, hspec
@@ -93424,8 +94594,8 @@ self: {
     ({ mkDerivation, base, hspec, hspec-core, HUnit, QuickCheck }:
      mkDerivation {
        pname = "hspec-contrib";
-       version = "0.3.0";
-       sha256 = "c4f62a0e23468716d735581ffa1899b4741c5ee43e696e40d7d03dd511f7da00";
+       version = "0.4.0";
+       sha256 = "6f9e2201ee176c723f91ee932b7fc8b677e0d54376f897f52c133c8ca9860c16";
        libraryHaskellDepends = [ base hspec-core HUnit ];
        testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ];
        homepage = "http://hspec.github.io/";
@@ -94870,6 +96040,8 @@ self: {
        pname = "html-conduit";
        version = "1.2.1.1";
        sha256 = "98c27470cbf99b12ca9705216567fc8aafffb843cd9c37762e8607da153aa8a8";
+       revision = "1";
+       editedCabalFile = "de32ca4d6df94a7c027a11db1b2e32ef1a7ccfe0565923f24528613ade821343";
        libraryHaskellDepends = [
          base bytestring conduit conduit-extra containers resourcet
          tagstream-conduit text transformers xml-conduit xml-types
@@ -94904,8 +96076,8 @@ self: {
      }:
      mkDerivation {
        pname = "html-entities";
-       version = "1.1.2";
-       sha256 = "cb3fdaf2329b6af5b59bc36c6a6721b0fe4d53c1b30885c82faf7b11fcab34de";
+       version = "1.1.3";
+       sha256 = "6bb2ae9f6b65b5652854e78ece26d7c78e4c5eef6c7f5a75ee88e6730469bc1d";
        libraryHaskellDepends = [
          attoparsec base-prelude text unordered-containers
        ];
@@ -96861,6 +98033,61 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hw-kafka-client" = callPackage
+    ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers
+     , either, hspec, monad-loops, rdkafka, regex-posix, temporary
+     , transformers, unix
+     }:
+     mkDerivation {
+       pname = "hw-kafka-client";
+       version = "1.0.0";
+       sha256 = "01722988ca762cfefcbb97944d408fb3f4463fe56a3697e7e3aba501962d3af0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bifunctors bytestring containers temporary transformers unix
+       ];
+       librarySystemDepends = [ rdkafka ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [
+         base bifunctors bytestring containers temporary transformers unix
+       ];
+       testHaskellDepends = [
+         base bifunctors bytestring containers either hspec monad-loops
+         regex-posix
+       ];
+       homepage = "https://github.com/haskell-works/hw-kafka-client";
+       description = "Kafka bindings for Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {inherit (pkgs) rdkafka;};
+
+  "hw-kafka-conduit" = callPackage
+    ({ mkDerivation, base, bifunctors, bytestring, conduit
+     , conduit-extra, containers, exceptions, hspec, hw-kafka-client
+     , mtl, resourcet, transformers
+     }:
+     mkDerivation {
+       pname = "hw-kafka-conduit";
+       version = "1.0.0";
+       sha256 = "9b37eecd87f4e166a9cf8fec4dc2685aadb458028fae5d2adaea480e05826d1a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bifunctors bytestring conduit conduit-extra containers
+         exceptions hw-kafka-client mtl resourcet transformers
+       ];
+       executableHaskellDepends = [
+         base bifunctors bytestring conduit containers resourcet
+       ];
+       testHaskellDepends = [
+         base bifunctors bytestring conduit conduit-extra containers hspec
+         hw-kafka-client mtl resourcet transformers
+       ];
+       homepage = "https://github.com/haskell-works/hw-kafka-client-conduit";
+       description = "Conduit bindings for kafka-client";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hw-mquery" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, dlist, hspec, QuickCheck }:
      mkDerivation {
@@ -101033,6 +102260,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "intro_0_1_0_8" = callPackage
+    ({ mkDerivation, base, bifunctors, binary, bytestring, containers
+     , deepseq, dlist, extra, hashable, lens, mtl, safe
+     , string-conversions, tagged, text, transformers
+     , unordered-containers, writer-cps-mtl
+     }:
+     mkDerivation {
+       pname = "intro";
+       version = "0.1.0.8";
+       sha256 = "09c570361dddf8c67572acffc7fd6c93bdfa1c8143d2f7eb9aec0ad5db4f21bf";
+       libraryHaskellDepends = [
+         base bifunctors binary bytestring containers deepseq dlist extra
+         hashable mtl safe string-conversions tagged text transformers
+         unordered-containers writer-cps-mtl
+       ];
+       testHaskellDepends = [
+         base bifunctors binary bytestring containers deepseq dlist extra
+         hashable lens mtl safe string-conversions tagged text transformers
+         unordered-containers writer-cps-mtl
+       ];
+       homepage = "https://github.com/minad/intro#readme";
+       description = "\"Fixed Prelude\" - Mostly total and safe, provides Text and Monad transformers";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "intro-prelude" = callPackage
     ({ mkDerivation, intro }:
      mkDerivation {
@@ -101401,6 +102654,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "iostring" = callPackage
+    ({ mkDerivation, base, bytestring, path, text }:
+     mkDerivation {
+       pname = "iostring";
+       version = "0.0.0.0";
+       sha256 = "d6865def561239a0e148d78c8e03a950308bcda45e70272ab6a64420d12a112f";
+       libraryHaskellDepends = [ base bytestring path text ];
+       homepage = "http://cs-syd.eu";
+       description = "A class of strings that can be involved in IO";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "iothread" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -104486,8 +105751,8 @@ self: {
      }:
      mkDerivation {
        pname = "jukebox";
-       version = "0.2.10";
-       sha256 = "24f5eb0e48f6f05fe8ef41400891f3fd3ce2a7d4ac59822454c610a79a4ffad8";
+       version = "0.2.11";
+       sha256 = "ec2419917909588b5aaf88fef64fc0b7cb40d9da9e41a26763c53def58f8c506";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -110507,6 +111772,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lifted-base_0_2_3_10" = callPackage
+    ({ mkDerivation, base, HUnit, monad-control, test-framework
+     , test-framework-hunit, transformers, transformers-base
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "lifted-base";
+       version = "0.2.3.10";
+       sha256 = "e677e560b176c40da2478d2f27dbeadc79630b2295ea3828603e0de4784d24fc";
+       libraryHaskellDepends = [ base monad-control transformers-base ];
+       testHaskellDepends = [
+         base HUnit monad-control test-framework test-framework-hunit
+         transformers transformers-base transformers-compat
+       ];
+       homepage = "https://github.com/basvandijk/lifted-base";
+       description = "lifted IO operations from the base library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lifted-protolude" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, deepseq
      , exceptions, ghc-prim, lifted-async, lifted-base, mtl, safe, stm
@@ -112692,6 +113977,8 @@ self: {
        pname = "log-elasticsearch";
        version = "0.7";
        sha256 = "bf2326aa0c54972452543973cec3f03f68c6d0c6f9aed285696425da24122bb7";
+       revision = "1";
+       editedCabalFile = "b2bd9f57908bc61b3869fdde26babb546db01aa2378e93734514a87448e5b135";
        libraryHaskellDepends = [
          aeson aeson-pretty base base64-bytestring bloodhound bytestring
          deepseq http-client log-base semigroups text text-show time
@@ -112750,23 +114037,23 @@ self: {
 
   "log-warper" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring
-     , data-default, directory, dlist, errors, exceptions, extra
-     , filepath, formatting, hashable, hslogger, hspec, HUnit, lens
-     , monad-control, mtl, QuickCheck, safecopy, text, text-format, time
-     , transformers, transformers-base, universum, unordered-containers
-     , yaml
+     , containers, data-default, directory, dlist, errors, exceptions
+     , extra, filepath, formatting, hashable, hslogger, hspec, HUnit
+     , lens, monad-control, monad-loops, mtl, QuickCheck, safecopy, text
+     , text-format, time, transformers, transformers-base, universum
+     , unordered-containers, yaml
      }:
      mkDerivation {
        pname = "log-warper";
-       version = "0.4.2";
-       sha256 = "78f497120d94dd64f85846e2f4c805c4f1dcbcedb655771678441e28bbe8d393";
+       version = "0.4.4";
+       sha256 = "9a2cfcf95d0c88ae6471106f67314e81e2bd370fe092a4f21d9459f1f235dbea";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson ansi-terminal base bytestring directory dlist errors
-         exceptions extra filepath formatting hashable hslogger lens
-         monad-control mtl safecopy text text-format time transformers
-         transformers-base universum unordered-containers yaml
+         aeson ansi-terminal base bytestring containers directory dlist
+         errors exceptions extra filepath formatting hashable hslogger lens
+         monad-control monad-loops mtl safecopy text text-format time
+         transformers transformers-base universum unordered-containers yaml
        ];
        executableHaskellDepends = [ base exceptions hslogger text ];
        testHaskellDepends = [
@@ -114404,10 +115691,8 @@ self: {
      }:
      mkDerivation {
        pname = "mackerel-client";
-       version = "0.0.2";
-       sha256 = "c0b9b1b074176b45771ae6b1bfb3bc41dacdb1c0ccfab675b06eceba037ddaf1";
-       revision = "1";
-       editedCabalFile = "e4fd64b142d46108e28cc52262779ae1096efefdb01ea6128f4a86161d880030";
+       version = "0.0.3";
+       sha256 = "aaa47cb30b2e727602de95d600446aba6094854bd772ac5be945b86cedbbc269";
        libraryHaskellDepends = [
          aeson base bytestring data-default directory filepath htoml
          http-client http-client-tls http-types parsec split text
@@ -114472,8 +115757,8 @@ self: {
      }:
      mkDerivation {
        pname = "madlang";
-       version = "0.1.0.3";
-       sha256 = "da323b35826c891860b6d93a79cc4d83c53ab7d4f558fab23bc706ac8fb58d43";
+       version = "0.1.0.5";
+       sha256 = "2fcb9eea46f6cd7d67164baaa82078b9c4f3a486ce9ff0abf225731e68066f7a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -115967,6 +117252,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "matrix-market-attoparsec" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, directory
+     , exceptions, hspec, QuickCheck, scientific
+     }:
+     mkDerivation {
+       pname = "matrix-market-attoparsec";
+       version = "0.1.0.3";
+       sha256 = "e6c71b7405174df690d7617d1b295bc12b3e8be52b766fff79801f207fc93e20";
+       libraryHaskellDepends = [
+         attoparsec base bytestring exceptions scientific
+       ];
+       testHaskellDepends = [
+         base directory exceptions hspec QuickCheck
+       ];
+       homepage = "https://github.com/ocramz/matrix-market-attoparsec";
+       description = "Parsing and serialization functions for the NIST Matrix Market format";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "matrix-market-pure" = callPackage
     ({ mkDerivation, array, base, containers }:
      mkDerivation {
@@ -117502,6 +118806,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "midi-simple" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, generic-random
+     , hspec, hspec-attoparsec, QuickCheck, tasty, tasty-hspec
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "midi-simple";
+       version = "0.1.0.0";
+       sha256 = "f680eed206f3623e01817794b9f7dd9a7c8fb6aa935648a3a5cb24119621849a";
+       libraryHaskellDepends = [ attoparsec base bytestring ];
+       testHaskellDepends = [
+         attoparsec base bytestring generic-random hspec hspec-attoparsec
+         QuickCheck tasty tasty-hspec tasty-quickcheck
+       ];
+       homepage = "https://github.com/tsahyt/midi-simple#readme";
+       description = "A simple and fast library for working with MIDI messages";
+       license = stdenv.lib.licenses.lgpl3;
+     }) {};
+
   "midi-util" = callPackage
     ({ mkDerivation, base, containers, event-list, midi, non-negative
      }:
@@ -118449,15 +119772,13 @@ self: {
      }) {};
 
   "modbus-tcp" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, mtl, network
-     , transformers
-     }:
+    ({ mkDerivation, base, bytestring, cereal, mtl, transformers }:
      mkDerivation {
        pname = "modbus-tcp";
-       version = "0.3";
-       sha256 = "539d030348f403431f763bcc822bc5e8dd946ed28e353e2a877427409b3d7737";
+       version = "0.4";
+       sha256 = "eb77f105623bdf639d0f309eb7fecbc89512b9b0d2acb47ae8f2a589b270510f";
        libraryHaskellDepends = [
-         base bytestring cereal mtl network transformers
+         base bytestring cereal mtl transformers
        ];
        homepage = "https://github.com/roelvandijk/modbus-tcp";
        description = "Communicate with Modbus devices over TCP";
@@ -119126,6 +120447,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "monad-logger_0_3_20_2" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, conduit
+     , conduit-extra, exceptions, fast-logger, lifted-base
+     , monad-control, monad-loops, mtl, resourcet, stm, stm-chans
+     , template-haskell, text, transformers, transformers-base
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "monad-logger";
+       version = "0.3.20.2";
+       sha256 = "1f004999b282b3895cc0904053befb48b863efc2899a89e93195b4544cc9c737";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring conduit conduit-extra exceptions
+         fast-logger lifted-base monad-control monad-loops mtl resourcet stm
+         stm-chans template-haskell text transformers transformers-base
+         transformers-compat
+       ];
+       homepage = "https://github.com/kazu-yamamoto/logger";
+       description = "A class of monads which can log messages";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-logger-json" = callPackage
     ({ mkDerivation, aeson, base, monad-logger, template-haskell, text
      }:
@@ -120149,6 +121493,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "mono-traversable_1_0_1_2" = callPackage
+    ({ mkDerivation, base, bytestring, containers, foldl, hashable
+     , hspec, HUnit, QuickCheck, semigroups, split, text, transformers
+     , unordered-containers, vector, vector-algorithms
+     }:
+     mkDerivation {
+       pname = "mono-traversable";
+       version = "1.0.1.2";
+       sha256 = "1875b0281b2956530c33d20cfdbc1d0e1d46d09d1f9623cff19c31b7a4d296ea";
+       libraryHaskellDepends = [
+         base bytestring containers hashable split text transformers
+         unordered-containers vector vector-algorithms
+       ];
+       testHaskellDepends = [
+         base bytestring containers foldl hspec HUnit QuickCheck semigroups
+         text transformers unordered-containers vector
+       ];
+       homepage = "https://github.com/snoyberg/mono-traversable";
+       description = "Type classes for mapping, folding, and traversing monomorphic containers";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mono-traversable-instances" = callPackage
     ({ mkDerivation, base, comonad, containers, dlist, dlist-instances
      , mono-traversable, semigroupoids, semigroups, transformers
@@ -128679,10 +130046,8 @@ self: {
      }:
      mkDerivation {
        pname = "orgstat";
-       version = "0.0.1";
-       sha256 = "573cf350998a5625162d997290d932ab962f3ed594e20e81c810c962892635c8";
-       revision = "2";
-       editedCabalFile = "90bf3eedb1ad96d0ac2601cbd6732270793c6b5a4d3fdc26592b688a3a387d47";
+       version = "0.0.2";
+       sha256 = "7187c2118b82f48f25306315160b3483e05a7638df53e5167fc519b8f8e4ff8d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -129411,6 +130776,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pandoc-citeproc_0_10_4_1" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+     , containers, data-default, directory, filepath, hs-bibutils, mtl
+     , old-locale, pandoc, pandoc-types, parsec, process, rfc5051
+     , setenv, split, syb, tagsoup, temporary, text, time
+     , unordered-containers, vector, xml-conduit, yaml
+     }:
+     mkDerivation {
+       pname = "pandoc-citeproc";
+       version = "0.10.4.1";
+       sha256 = "6e6b0a89a831f9bfaa33dc0f3dff1792ee1626a5e66e1bd34da9447cd3c7de51";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default directory filepath
+         hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
+         setenv split syb tagsoup text time unordered-containers vector
+         xml-conduit yaml
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty attoparsec base bytestring filepath pandoc
+         pandoc-types syb text yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory filepath mtl pandoc pandoc-types
+         process temporary text yaml
+       ];
+       doCheck = false;
+       homepage = "https://github.com/jgm/pandoc-citeproc";
+       description = "Supports using pandoc with citeproc";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pandoc-citeproc-preamble" = callPackage
     ({ mkDerivation, base, directory, filepath, pandoc-types, process
      }:
@@ -132147,41 +133546,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "persistent_2_2_4_1" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
-     , blaze-html, blaze-markup, bytestring, conduit, containers
-     , exceptions, fast-logger, hspec, http-api-data, lifted-base
-     , monad-control, monad-logger, mtl, old-locale, path-pieces
-     , resource-pool, resourcet, scientific, silently, tagged
-     , template-haskell, text, time, transformers, transformers-base
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "persistent";
-       version = "2.2.4.1";
-       sha256 = "1473bdd952854d7f5fdb5896d2df07ef1ecf301c7fdb136054f49625329d50db";
-       libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring blaze-html blaze-markup
-         bytestring conduit containers exceptions fast-logger http-api-data
-         lifted-base monad-control monad-logger mtl old-locale path-pieces
-         resource-pool resourcet scientific silently tagged template-haskell
-         text time transformers transformers-base unordered-containers
-         vector
-       ];
-       testHaskellDepends = [
-         aeson attoparsec base base64-bytestring blaze-html bytestring
-         conduit containers fast-logger hspec http-api-data lifted-base
-         monad-control monad-logger mtl old-locale path-pieces resource-pool
-         resourcet scientific tagged template-haskell text time transformers
-         unordered-containers vector
-       ];
-       homepage = "http://www.yesodweb.com/book/persistent";
-       description = "Type-safe, multi-backend data serialization";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
-     }) {};
-
   "persistent" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , blaze-html, blaze-markup, bytestring, conduit, containers
@@ -132546,29 +133910,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "persistent-sqlite_2_2_1" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, conduit, containers
-     , hspec, monad-control, monad-logger, old-locale, persistent
-     , persistent-template, resourcet, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "persistent-sqlite";
-       version = "2.2.1";
-       sha256 = "bac71080bb25ad20b9116e42df463bbe230bacb2d963a5b101a501cff7fffc5e";
-       libraryHaskellDepends = [
-         aeson base bytestring conduit containers monad-control monad-logger
-         old-locale persistent resourcet text time transformers
-       ];
-       testHaskellDepends = [
-         base hspec persistent persistent-template time transformers
-       ];
-       homepage = "http://www.yesodweb.com/book/persistent";
-       description = "Backend for the persistent library using sqlite3";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
-     }) {};
-
   "persistent-sqlite" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , hspec, monad-control, monad-logger, old-locale, persistent
@@ -132594,31 +133935,6 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
-  "persistent-template_2_1_8_1" = callPackage
-    ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers
-     , ghc-prim, hspec, http-api-data, monad-control, monad-logger
-     , path-pieces, persistent, QuickCheck, tagged, template-haskell
-     , text, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "persistent-template";
-       version = "2.1.8.1";
-       sha256 = "34911f40028357567717f6724abae4e6fc905567ffc8ba8ee5042e9680b2f168";
-       libraryHaskellDepends = [
-         aeson aeson-compat base bytestring containers ghc-prim
-         http-api-data monad-control monad-logger path-pieces persistent
-         tagged template-haskell text transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring hspec persistent QuickCheck text transformers
-       ];
-       homepage = "http://www.yesodweb.com/book/persistent";
-       description = "Type-safe, non-relational, multi-backend persistence";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
-     }) {};
-
   "persistent-template" = callPackage
     ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers
      , ghc-prim, hspec, http-api-data, monad-control, monad-logger
@@ -134171,6 +135487,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-misc_0_2_4_0" = callPackage
+    ({ mkDerivation, base, clock, Decimal, hspec, lens, mmorph, mtl
+     , pipes, pipes-category, pipes-concurrency, semigroups, stm
+     , transformers
+     }:
+     mkDerivation {
+       pname = "pipes-misc";
+       version = "0.2.4.0";
+       sha256 = "5602e1cc4a726b62de393b0236db0ba1bbd2f847f8fc5ac30c5ee727fb40041b";
+       libraryHaskellDepends = [
+         base clock Decimal lens mtl pipes pipes-category pipes-concurrency
+         semigroups stm transformers
+       ];
+       testHaskellDepends = [
+         base hspec lens mmorph pipes pipes-concurrency stm transformers
+       ];
+       homepage = "https://github.com/louispan/pipes-misc#readme";
+       description = "Miscellaneous utilities for pipes, required by glazier-tutorial";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-mongodb" = callPackage
     ({ mkDerivation, base, monad-control, mongoDB, pipes, text }:
      mkDerivation {
@@ -135205,16 +136543,16 @@ self: {
      }) {};
 
   "pocket" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, http-client
-     , http-client-tls, servant, servant-client, text, transformers
+    ({ mkDerivation, aeson, base, http-client, http-client-tls, servant
+     , servant-client, text, transformers
      }:
      mkDerivation {
        pname = "pocket";
-       version = "0.1.0";
-       sha256 = "c73d73f4221023178324a954c4c0f5873febed698db8ed86acf70d999eb6b712";
+       version = "0.2.0";
+       sha256 = "5f9c76f99aacd6a9daf2075daf989af8387c76e411f91b36073ebca2d204d6b9";
        libraryHaskellDepends = [
-         aeson attoparsec base bytestring http-client http-client-tls
-         servant servant-client text transformers
+         aeson base http-client http-client-tls servant servant-client text
+         transformers
        ];
        homepage = "https://github.com/jpvillaisaza/pocket-haskell";
        description = "Bindings for the Pocket API";
@@ -136290,6 +137628,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "postgresql-binary_0_9_3" = callPackage
+    ({ mkDerivation, aeson, base, base-prelude, binary-parser
+     , bytestring, conversion, conversion-bytestring, conversion-text
+     , foldl, json-ast, loch-th, placeholders, postgresql-libpq
+     , QuickCheck, quickcheck-instances, rerebase, scientific, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text, time
+     , transformers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "postgresql-binary";
+       version = "0.9.3";
+       sha256 = "fdc10a4ccc5c6927f39d89450395c5316448b5f4d763c6386d1b056cc9685d04";
+       libraryHaskellDepends = [
+         aeson base base-prelude binary-parser bytestring foldl loch-th
+         placeholders scientific text time transformers uuid vector
+       ];
+       testHaskellDepends = [
+         aeson conversion conversion-bytestring conversion-text json-ast
+         loch-th placeholders postgresql-libpq QuickCheck
+         quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
+         tasty-smallcheck
+       ];
+       homepage = "https://github.com/nikita-volkov/postgresql-binary";
+       description = "Encoders and decoders for the PostgreSQL's binary format";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "postgresql-config" = callPackage
     ({ mkDerivation, aeson, base, bytestring, monad-control, mtl
      , postgresql-simple, resource-pool, time
@@ -136525,6 +137891,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "postgresql-simple-migration_0_1_9_0" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash
+     , directory, hspec, postgresql-simple, text, time
+     }:
+     mkDerivation {
+       pname = "postgresql-simple-migration";
+       version = "0.1.9.0";
+       sha256 = "005d2f031ab8d889daaee5cffdb222dbe164267042829b88031166b66361726a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring cryptohash directory
+         postgresql-simple time
+       ];
+       executableHaskellDepends = [
+         base base64-bytestring bytestring cryptohash directory
+         postgresql-simple text time
+       ];
+       testHaskellDepends = [ base bytestring hspec postgresql-simple ];
+       homepage = "https://github.com/ameingast/postgresql-simple-migration";
+       description = "PostgreSQL Schema Migrations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "postgresql-simple-opts" = callPackage
     ({ mkDerivation, base, bytestring, hspec, markdown-unlit
      , optparse-applicative, optparse-generic, postgresql-simple
@@ -136836,6 +138227,41 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "powerqueue" = callPackage
+    ({ mkDerivation, async, base, contravariant, hspec, stm }:
+     mkDerivation {
+       pname = "powerqueue";
+       version = "0.1.0.0";
+       sha256 = "91835dd0495cb47b5a589703e7904104e7001597f06039f87067192fcdb8254c";
+       libraryHaskellDepends = [ async base contravariant ];
+       testHaskellDepends = [ async base hspec stm ];
+       homepage = "https://github.com/agrafix/powerqueue#readme";
+       description = "A flexible job queue with exchangeable backends";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "powerqueue-levelmem" = callPackage
+    ({ mkDerivation, async, base, bytestring, cereal, dlist, filepath
+     , focus, hspec, leveldb, leveldb-haskell, list-t, powerqueue
+     , snappy, stm, stm-containers, temporary, unagi-chan
+     }:
+     mkDerivation {
+       pname = "powerqueue-levelmem";
+       version = "0.1.0.0";
+       sha256 = "b23d92c0b70b06e4168f03cdfedf7d38f12c85bcf493fb8874e66bd5ddc7ee76";
+       libraryHaskellDepends = [
+         async base bytestring cereal dlist filepath focus leveldb-haskell
+         list-t powerqueue stm stm-containers unagi-chan
+       ];
+       testHaskellDepends = [
+         async base cereal hspec powerqueue temporary
+       ];
+       testSystemDepends = [ leveldb snappy ];
+       homepage = "https://github.com/agrafix/powerqueue#readme";
+       description = "A high performance in memory and LevelDB backend for powerqueue";
+       license = stdenv.lib.licenses.bsd3;
+     }) {inherit (pkgs) leveldb; inherit (pkgs) snappy;};
+
   "ppm" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -138302,6 +139728,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "profiteur_0_4_2_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, filepath
+     , ghc-prof, js-jquery, scientific, text, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "profiteur";
+       version = "0.4.2.1";
+       sha256 = "6b2af36243f15aa5396e0056159d9ad38422cce9eebafa59e6d439b2a8932916";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base bytestring containers filepath ghc-prof js-jquery
+         scientific text unordered-containers vector
+       ];
+       homepage = "http://github.com/jaspervdj/profiteur";
+       description = "Treemap visualiser for GHC prof files";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "profunctor-extras" = callPackage
     ({ mkDerivation, base, profunctors }:
      mkDerivation {
@@ -138773,8 +140220,8 @@ self: {
      }:
      mkDerivation {
        pname = "proto-lens";
-       version = "0.1.0.4";
-       sha256 = "2d4d1fc8fea2aae5bec2da31f64cac3a9ed11608628fde9f549b46476d51000e";
+       version = "0.1.0.5";
+       sha256 = "d3096c4e089bc7a8e6221afde8afc0b02f8e67028e119f3be04906cf4fc67a6e";
        libraryHaskellDepends = [
          attoparsec base bytestring containers data-default-class
          lens-family parsec pretty text transformers void
@@ -138825,6 +140272,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "proto-lens-descriptors" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-default-class
+     , lens-family, proto-lens, text
+     }:
+     mkDerivation {
+       pname = "proto-lens-descriptors";
+       version = "0.1.0.5";
+       sha256 = "89e2eef7c99dc8ca669ad63dd4020a5d05133f92ddb148b1965ced523a6ad18a";
+       libraryHaskellDepends = [
+         base bytestring containers data-default-class lens-family
+         proto-lens text
+       ];
+       description = "Protocol buffers for describing the definitions of messages";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "proto-lens-optparse" = callPackage
     ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
      mkDerivation {
@@ -138843,21 +140306,22 @@ self: {
   "proto-lens-protoc" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers
      , data-default-class, directory, filepath, haskell-src-exts
-     , lens-family, process, proto-lens, text
+     , lens-family, process, proto-lens, proto-lens-descriptors, text
      }:
      mkDerivation {
        pname = "proto-lens-protoc";
-       version = "0.1.0.4";
-       sha256 = "bb5f04069ae2fd5d7a429523434be7c1c5e2a279a49394bf27d4a212b35d3e62";
+       version = "0.1.0.5";
+       sha256 = "0efb5b62e2cccb3edc29b93c75aabcccc652992a01e8f5eae7bf7eae2078192e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring Cabal containers data-default-class directory
-         filepath haskell-src-exts lens-family process proto-lens text
+         filepath haskell-src-exts lens-family process proto-lens
+         proto-lens-descriptors text
        ];
        executableHaskellDepends = [
          base bytestring containers data-default-class filepath
-         haskell-src-exts lens-family proto-lens text
+         haskell-src-exts lens-family proto-lens proto-lens-descriptors text
        ];
        description = "Protocol buffer compiler for the proto-lens library";
        license = stdenv.lib.licenses.bsd3;
@@ -139520,8 +140984,8 @@ self: {
     ({ mkDerivation, base, containers, libpulseaudio, stm, unix }:
      mkDerivation {
        pname = "pulseaudio";
-       version = "0.0.1.1";
-       sha256 = "11696b8df21dc010b0792c3b7ded2ea683b4d379657eca39ace2a04fabaf36f0";
+       version = "0.0.2.0";
+       sha256 = "72cbacaf7c94bdaa27c9e0d299a00fe3f31e0cc0f9c2d6e7de9690b3154c078e";
        libraryHaskellDepends = [ base containers stm unix ];
        librarySystemDepends = [ libpulseaudio ];
        description = "A low-level (incomplete) wrapper around the pulseaudio client asynchronous api";
@@ -140355,17 +141819,14 @@ self: {
      }:
      mkDerivation {
        pname = "qr-imager";
-       version = "0.2.2.0";
-       sha256 = "ea05cd1bad4720bbd0927c118add95e83e4d92a576d81c4f1b56d32b726d3e47";
-       isLibrary = true;
-       isExecutable = true;
+       version = "1.0.0.1";
+       sha256 = "ab437b12f05962d92a54a9dbaec62bb1df4cf688434b42ea3d3c958ee2a8278e";
        libraryHaskellDepends = [
          aeson base bytestring cryptonite directory haskell-qrencode
          jose-jwt JuicyPixels lens MissingH optparse-applicative process
          vector
        ];
        libraryPkgconfigDepends = [ libqrencode ];
-       executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/vmchale/QRImager#readme";
        description = "Library to generate QR codes from bytestrings and objects";
@@ -143369,6 +144830,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "read-io" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, hspec }:
+     mkDerivation {
+       pname = "read-io";
+       version = "0.0.0.1";
+       sha256 = "5c3efb07e781f53b9053ba97927076801825cb49b2f012a9911f64cbc65937e6";
+       libraryHaskellDepends = [ base containers directory filepath ];
+       testHaskellDepends = [ base containers directory filepath hspec ];
+       homepage = "https://github.com/zaidan/read-io#readme";
+       description = "Read IO library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "readable" = callPackage
     ({ mkDerivation, base, bytestring, text }:
      mkDerivation {
@@ -145362,6 +146836,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relational-query_0_8_3_5" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, dlist
+     , names-th, persistable-record, quickcheck-simple, sql-words
+     , template-haskell, text, th-reify-compat, time, time-locale-compat
+     , transformers
+     }:
+     mkDerivation {
+       pname = "relational-query";
+       version = "0.8.3.5";
+       sha256 = "473145c2bf23b03711a307b4dd6a22609606327e0c15f8f27f874ee783f7f1a6";
+       libraryHaskellDepends = [
+         array base bytestring containers dlist names-th persistable-record
+         sql-words template-haskell text th-reify-compat time
+         time-locale-compat transformers
+       ];
+       testHaskellDepends = [
+         base containers quickcheck-simple transformers
+       ];
+       homepage = "http://khibino.github.io/haskell-relational-record/";
+       description = "Typeful, Modular, Relational, algebraic query engine";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "relational-query-HDBC" = callPackage
     ({ mkDerivation, base, containers, convertible, dlist, HDBC
      , HDBC-session, names-th, persistable-record, relational-query
@@ -145399,6 +146897,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relational-record_0_1_6_0" = callPackage
+    ({ mkDerivation, base, persistable-types-HDBC-pg, relational-query
+     , relational-query-HDBC
+     }:
+     mkDerivation {
+       pname = "relational-record";
+       version = "0.1.6.0";
+       sha256 = "7f7b6ba0a9646e475b0092a062cbffd32f8cabb0d4da1f29e7c0672472afb115";
+       libraryHaskellDepends = [
+         base persistable-types-HDBC-pg relational-query
+         relational-query-HDBC
+       ];
+       homepage = "http://khibino.github.io/haskell-relational-record/";
+       description = "Meta package of Relational Record";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "relational-record-examples" = callPackage
     ({ mkDerivation, base, HDBC, HDBC-session, HDBC-sqlite3
      , persistable-record, relational-query, relational-query-HDBC
@@ -145523,8 +147039,8 @@ self: {
      }:
      mkDerivation {
        pname = "remarks";
-       version = "0.1.11";
-       sha256 = "769f3e9bd64926a8bf00e76d60265baf02d69d3622a161f5e43e3b21a4f0e245";
+       version = "0.1.12";
+       sha256 = "3a36340fd00c3cd002dc1494508e1577004ea71a204e66785a1861d61356d087";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers GenericPretty pretty ];
@@ -147019,8 +148535,8 @@ self: {
      }:
      mkDerivation {
        pname = "reverse-geocoding";
-       version = "0.2.4.0";
-       sha256 = "07a70639586b92b557b922672685b353ff47fbbdb963196b0cd1d88020cf791d";
+       version = "0.3.0.0";
+       sha256 = "d29cd172aaccd01856a7fcf05995e1418a36d813f724fa5fdec566e829bb78b0";
        libraryHaskellDepends = [
          aeson base iso3166-country-codes lens lens-aeson text wreq
        ];
@@ -148853,6 +150369,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "safe_0_3_14" = callPackage
+    ({ mkDerivation, base, deepseq, QuickCheck }:
+     mkDerivation {
+       pname = "safe";
+       version = "0.3.14";
+       sha256 = "db580cc748f6421e54a9a86a4cbf75c39cfc696880e31f972f99731737fdc88f";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base deepseq QuickCheck ];
+       homepage = "https://github.com/ndmitchell/safe#readme";
+       description = "Library of safe (exception free) functions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "safe-access" = callPackage
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
@@ -151677,9 +153207,9 @@ self: {
      }:
      mkDerivation {
        pname = "semiring-num";
-       version = "0.9.0.1";
-       sha256 = "2605eddf961927ce04be8167a2a01123ee0a0dcae55dcd44f3830736ae4d9830";
-       libraryHaskellDepends = [ base containers template-haskell ];
+       version = "1.1.0.1";
+       sha256 = "49702af909207e5025b06ebb8f597e2334feeb7c040ffb774d8f6630ceac3678";
+       libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [
          base containers doctest nat-sized-numbers QuickCheck smallcheck
        ];
@@ -152566,17 +154096,15 @@ self: {
 
   "servant-auth-token" = callPackage
     ({ mkDerivation, aeson-injector, base, bytestring, containers, mtl
-     , persistent, persistent-postgresql, persistent-template
      , pwstore-fast, servant-auth-token-api, servant-server, text, time
      , transformers, uuid
      }:
      mkDerivation {
        pname = "servant-auth-token";
-       version = "0.4.0.0";
-       sha256 = "e194c5c860508e22b8eb030d6c52c431df9fd7631a6287b042b48daf74825250";
+       version = "0.4.1.0";
+       sha256 = "4d2165bed0789e627cc716270491bf87863d5cda4c3041dfd10c0a297b22e3dc";
        libraryHaskellDepends = [
-         aeson-injector base bytestring containers mtl persistent
-         persistent-postgresql persistent-template pwstore-fast
+         aeson-injector base bytestring containers mtl pwstore-fast
          servant-auth-token-api servant-server text time transformers uuid
        ];
        homepage = "https://github.com/ncrashed/servant-auth-token#readme";
@@ -152594,8 +154122,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token-acid";
-       version = "0.4.0.0";
-       sha256 = "22c16f9a7d05a3555c7f3195248165b384c99792bf0e952326d3992831da318b";
+       version = "0.4.1.0";
+       sha256 = "517d4e084cd0884ec1931f2fbe19039c7af16e14b86bf36aeddde844bdbc3354";
        libraryHaskellDepends = [
          acid-state aeson-injector base bytestring containers ghc-prim
          monad-control mtl safe safecopy servant-auth-token
@@ -152917,6 +154445,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-elm_0_4_0_1" = callPackage
+    ({ mkDerivation, aeson, base, Diff, elm-export, hspec, HUnit, lens
+     , servant, servant-foreign, text, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "servant-elm";
+       version = "0.4.0.1";
+       sha256 = "69b3a5dcbb680fc1e923d76afa8255987d4613e0d4387eb493de071c9842ffc5";
+       libraryHaskellDepends = [
+         base elm-export lens servant servant-foreign text wl-pprint-text
+       ];
+       testHaskellDepends = [
+         aeson base Diff elm-export hspec HUnit servant text
+       ];
+       homepage = "http://github.com/mattjbray/servant-elm#readme";
+       description = "Automatically derive Elm functions to query servant webservices";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-examples" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, either
      , http-types, js-jquery, lucid, random, servant, servant-client
@@ -153531,6 +155079,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-subscriber_0_6_0_0" = callPackage
+    ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder
+     , bytestring, case-insensitive, containers, directory, filepath
+     , http-types, lens, lifted-base, monad-control, monad-logger
+     , network-uri, purescript-bridge, servant, servant-foreign
+     , servant-server, stm, text, time, transformers, wai
+     , wai-websockets, warp, websockets
+     }:
+     mkDerivation {
+       pname = "servant-subscriber";
+       version = "0.6.0.0";
+       sha256 = "1875445b8dde41e86dd962bd71848255a6ea25e54c21cd9cf046638c16ff405d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async attoparsec base blaze-builder bytestring
+         case-insensitive containers directory filepath http-types lens
+         lifted-base monad-control monad-logger network-uri servant
+         servant-foreign servant-server stm text time transformers wai
+         wai-websockets warp websockets
+       ];
+       executableHaskellDepends = [ base purescript-bridge ];
+       homepage = "http://github.com/eskimor/servant-subscriber#readme";
+       description = "When REST is not enough ...";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-swagger" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, bytestring, directory
      , doctest, filepath, hspec, http-media, insert-ordered-containers
@@ -157781,20 +159357,20 @@ self: {
      , case-insensitive, configurator, containers, data-default
      , digestive-functors, digestive-functors-heist
      , digestive-functors-snap, directory-tree, filepath, heist, jmacro
-     , lens, mtl, pcre-light, QuickCheck, readable, safe, snap
-     , snap-core, tasty, tasty-hunit, tasty-quickcheck, text, time
+     , lens, map-syntax, mtl, pcre-light, QuickCheck, readable, safe
+     , snap, snap-core, tasty, tasty-hunit, tasty-quickcheck, text, time
      , transformers, wl-pprint-text, xmlhtml
      }:
      mkDerivation {
        pname = "snap-extras";
-       version = "0.11.0.2";
-       sha256 = "15e8ab812bf53b3f7ab0377e945b3e3448d5b8d4b89404751f83d51d722deb5e";
+       version = "0.12.0.0";
+       sha256 = "76ec979fa905a305392a545f24c6a33217e83aeedd0a8eec311623722b26e494";
        libraryHaskellDepends = [
          aeson base blaze-builder blaze-html bytestring case-insensitive
          configurator containers data-default digestive-functors
          digestive-functors-heist digestive-functors-snap directory-tree
-         filepath heist jmacro lens mtl pcre-light readable safe snap
-         snap-core text time transformers wl-pprint-text xmlhtml
+         filepath heist jmacro lens map-syntax mtl pcre-light readable safe
+         snap snap-core text time transformers wl-pprint-text xmlhtml
        ];
        testHaskellDepends = [
          base bytestring containers QuickCheck snap-core tasty tasty-hunit
@@ -159830,6 +161406,29 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "sparse-linear-algebra_0_2_9_1" = callPackage
+    ({ mkDerivation, base, containers, criterion, exceptions, hspec
+     , mtl, mwc-random, primitive, QuickCheck, transformers, vector
+     , vector-algorithms, vector-space
+     }:
+     mkDerivation {
+       pname = "sparse-linear-algebra";
+       version = "0.2.9.1";
+       sha256 = "5210a7491d2cd6efb5c4cf7be53c10a8c4240b0653bd7d8bfbb5c5f86393a442";
+       libraryHaskellDepends = [
+         base containers exceptions mtl transformers vector
+         vector-algorithms vector-space
+       ];
+       testHaskellDepends = [
+         base containers criterion exceptions hspec mtl mwc-random primitive
+         QuickCheck vector-space
+       ];
+       homepage = "https://github.com/ocramz/sparse-linear-algebra";
+       description = "Sparse linear algebra in native Haskell";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sparsebit" = callPackage
     ({ mkDerivation, base, haskell98 }:
      mkDerivation {
@@ -161237,6 +162836,8 @@ self: {
        pname = "stack";
        version = "1.3.2";
        sha256 = "488b9292ea605c92f6ebf79b233e8e374d857b21053051cb44b305dad8f0d3f7";
+       revision = "2";
+       editedCabalFile = "c15bab02b5aa26847ce94aab4bca3ac7bbd38e7e3c56039364f70bb107cb7968";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -162199,8 +163800,8 @@ self: {
        pname = "stb-image-redux";
        version = "0.2.1.0";
        sha256 = "c0e4a5d2bf6d99934430ffd068cb3d28003554c5c8beb84ce76dd487f191eb1d";
-       revision = "1";
-       editedCabalFile = "cc40e775afe473f06ae9f2c9864fdeee7fa4830b2f4b7ee5a8bed504baa4007b";
+       revision = "2";
+       editedCabalFile = "e2e25f22d0fedbe7c49b0c0db29511c4bbc03bcc4dd95ec18c840d6f060f9ac6";
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base hspec vector ];
        homepage = "https://github.com/sasinestro/stb-image-redux#readme";
@@ -162904,23 +164505,23 @@ self: {
   "store" = callPackage
     ({ mkDerivation, array, async, base, base-orphans
      , base64-bytestring, bytestring, cereal, cereal-vector, conduit
-     , containers, criterion, cryptohash, deepseq, directory, filepath
-     , free, ghc-prim, hashable, hspec, hspec-smallcheck, integer-gmp
-     , lifted-base, monad-control, mono-traversable, network, primitive
-     , resourcet, safe, semigroups, smallcheck, store-core
-     , streaming-commons, syb, template-haskell, text, th-lift
-     , th-lift-instances, th-orphans, th-reify-many, th-utilities, time
-     , transformers, unordered-containers, vector
+     , containers, contravariant, criterion, cryptohash, deepseq
+     , directory, filepath, free, ghc-prim, hashable, hspec
+     , hspec-smallcheck, integer-gmp, lifted-base, monad-control
+     , mono-traversable, network, primitive, resourcet, safe, semigroups
+     , smallcheck, store-core, streaming-commons, syb, template-haskell
+     , text, th-lift, th-lift-instances, th-orphans, th-reify-many
+     , th-utilities, time, transformers, unordered-containers, vector
      , vector-binary-instances, void, weigh
      }:
      mkDerivation {
        pname = "store";
-       version = "0.3";
-       sha256 = "bdefbf35d52ef36d33b57eed5f24761e33feb689ef38fba3eebcfab723491b5b";
+       version = "0.3.1";
+       sha256 = "ec1005ebaf7334f6e5166315f8406553c94cffa8e06bc1d60f372c0d46ceda90";
        libraryHaskellDepends = [
          array async base base-orphans base64-bytestring bytestring conduit
-         containers cryptohash deepseq directory filepath free ghc-prim
-         hashable hspec hspec-smallcheck integer-gmp lifted-base
+         containers contravariant cryptohash deepseq directory filepath free
+         ghc-prim hashable hspec hspec-smallcheck integer-gmp lifted-base
          monad-control mono-traversable network primitive resourcet safe
          semigroups smallcheck store-core streaming-commons syb
          template-haskell text th-lift th-lift-instances th-orphans
@@ -162929,14 +164530,14 @@ self: {
        ];
        testHaskellDepends = [
          array async base base-orphans base64-bytestring bytestring cereal
-         cereal-vector conduit containers criterion cryptohash deepseq
-         directory filepath free ghc-prim hashable hspec hspec-smallcheck
-         integer-gmp lifted-base monad-control mono-traversable network
-         primitive resourcet safe semigroups smallcheck store-core
-         streaming-commons syb template-haskell text th-lift
-         th-lift-instances th-orphans th-reify-many th-utilities time
-         transformers unordered-containers vector vector-binary-instances
-         void weigh
+         cereal-vector conduit containers contravariant criterion cryptohash
+         deepseq directory filepath free ghc-prim hashable hspec
+         hspec-smallcheck integer-gmp lifted-base monad-control
+         mono-traversable network primitive resourcet safe semigroups
+         smallcheck store-core streaming-commons syb template-haskell text
+         th-lift th-lift-instances th-orphans th-reify-many th-utilities
+         time transformers unordered-containers vector
+         vector-binary-instances void weigh
        ];
        homepage = "https://github.com/fpco/store#readme";
        description = "Fast binary serialization";
@@ -163499,6 +165100,8 @@ self: {
        pname = "strict-identity";
        version = "0.1.0.0";
        sha256 = "218e8746098c246a5cf497e96eac6b4305495de18dc5f281598d79b54e8decbb";
+       revision = "1";
+       editedCabalFile = "dfbae3f135c13e0809e251df1c3f654eaa80c74d8cce3be4ca5c29f777fb6a53";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/cartazio/strict-identity";
        description = "Strict Identity Monad, handy for writing fast code!";
@@ -167112,6 +168715,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty_0_11_2" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, clock, containers
+     , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged
+     , unbounded-delays
+     }:
+     mkDerivation {
+       pname = "tasty";
+       version = "0.11.2";
+       sha256 = "d26fbc4e5112af9ec3ca0a4a45d0f5edc5ae6675ffd72f922acb768062db675e";
+       libraryHaskellDepends = [
+         ansi-terminal async base clock containers deepseq mtl
+         optparse-applicative regex-tdfa stm tagged unbounded-delays
+       ];
+       homepage = "http://documentup.com/feuerbach/tasty";
+       description = "Modern and extensible testing framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-ant-xml" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
@@ -167510,8 +169132,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-stats";
-       version = "0.2.0.0";
-       sha256 = "73a1e34f30eeddf2e855c1c8813338ae4aa23f29ea74f4c0272f0e6de5007e9d";
+       version = "0.2.0.1";
+       sha256 = "0957921fffb8ecc225694ab16812d329dbb3ab60c4905cd08bca6b087faa4311";
        libraryHaskellDepends = [
          base containers directory process stm tagged tasty time
        ];
@@ -171113,18 +172735,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "time_1_7_0_1" = callPackage
-    ({ mkDerivation, base, deepseq, QuickCheck, test-framework
-     , test-framework-quickcheck2, unix
+  "time_1_8" = callPackage
+    ({ mkDerivation, base, deepseq, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck, unix
      }:
      mkDerivation {
        pname = "time";
-       version = "1.7.0.1";
-       sha256 = "2730197c3665a1e5af87475de7a57cf0dd8ddbd339167251b4a44cb3b61407ca";
+       version = "1.8";
+       sha256 = "38631adfbcd176a3f62fe3b14d9e03a44cc95e1971e4eeb7d46e1018e9e59aff";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [
-         base deepseq QuickCheck test-framework test-framework-quickcheck2
-         unix
+         base deepseq QuickCheck tasty tasty-hunit tasty-quickcheck unix
        ];
        homepage = "https://github.com/haskell/time";
        description = "A time library";
@@ -176128,6 +177749,8 @@ self: {
        pname = "unfoldable";
        version = "0.9.2";
        sha256 = "9592ec5b6d021fe5c93bc2a047e4f9dddb4bc688bae546fb357e8cd4071b0e04";
+       revision = "1";
+       editedCabalFile = "21e9b1499fe1d0232359616b81cb8cb4b7e4efdbca5550d5643118edb45be94d";
        libraryHaskellDepends = [
          base containers ghc-prim one-liner QuickCheck random transformers
        ];
@@ -176383,6 +178006,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unicode-transforms_0_3_0" = callPackage
+    ({ mkDerivation, base, bitarray, bytestring, deepseq
+     , getopt-generics, QuickCheck, split, text
+     }:
+     mkDerivation {
+       pname = "unicode-transforms";
+       version = "0.3.0";
+       sha256 = "2dc25ead8d19598f6833a490ef1b1f29b9c1f987c8224fd99be6820535aa5245";
+       libraryHaskellDepends = [ base bitarray bytestring text ];
+       testHaskellDepends = [
+         base deepseq getopt-generics QuickCheck split text
+       ];
+       homepage = "http://github.com/harendra-kumar/unicode-transforms";
+       description = "Unicode normalization";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unicoder" = callPackage
     ({ mkDerivation, attoparsec, base, directory, text }:
      mkDerivation {
@@ -178636,8 +180277,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "validity";
-       version = "0.3.1.1";
-       sha256 = "c5ba39b30af35e275467bf016d9df71f3368abaaeb0d47c0cbbdbf78de627b0c";
+       version = "0.3.2.0";
+       sha256 = "e6ac32bfc76284be81817098be5192d91aac84ff9985b26ecd41a0cded54729e";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity typeclass";
@@ -178684,14 +180325,26 @@ self: {
     ({ mkDerivation, base, text, validity }:
      mkDerivation {
        pname = "validity-text";
-       version = "0.1.0.1";
-       sha256 = "ab92980b7e900db8cf8e11cf986a5a952d2306cbb4735e8bc810acf8ca5e2189";
+       version = "0.1.1.0";
+       sha256 = "43cf2ce6b53a406901cae0ac01d1e46a70e2c7eddac129e35f242bbb82bf7a02";
        libraryHaskellDepends = [ base text validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for text";
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "validity-time" = callPackage
+    ({ mkDerivation, base, time, validity }:
+     mkDerivation {
+       pname = "validity-time";
+       version = "0.0.0.0";
+       sha256 = "4c061a1c238c846e2e6e9838355c9a340ffc6080fb9185b18fb3c8667178af3d";
+       libraryHaskellDepends = [ base time validity ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Validity instances for time";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "value-supply" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -179708,6 +181361,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "viewprof_0_0_0_2" = callPackage
+    ({ mkDerivation, base, brick, containers, ghc-prof, lens
+     , scientific, text, vector, vector-algorithms, vty
+     }:
+     mkDerivation {
+       pname = "viewprof";
+       version = "0.0.0.2";
+       sha256 = "52962f9eca6970001b703fdb4948d375d3bf5521e803ac98ad7a60eb1d25bffb";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base brick containers ghc-prof lens scientific text vector
+         vector-algorithms vty
+       ];
+       homepage = "https://github.com/maoe/viewprof";
+       description = "Text-based interactive GHC .prof viewer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "views" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -183035,8 +184708,8 @@ self: {
     ({ mkDerivation, base, mtl, semiring-num, transformers }:
      mkDerivation {
        pname = "weighted";
-       version = "0.3.0.0";
-       sha256 = "6d30cf0d4a833f82ed2e44e22c81658e55744f53308a25a895eaf7bc940131cb";
+       version = "0.3.0.1";
+       sha256 = "1a5d93717a03e573fcc3a691206954b5b4d59e46b42b580e1d92e7048ae13ff6";
        libraryHaskellDepends = [ base mtl semiring-num transformers ];
        homepage = "https://github.com/oisdk/weighted";
        description = "Writer monad which uses semiring constraint";
@@ -184233,10 +185906,8 @@ self: {
      }:
      mkDerivation {
        pname = "wreq";
-       version = "0.4.1.0";
-       sha256 = "3b8409e2fb7670d7060fdaa780008eeecb08e9b65bdab9d9690d8d26e5cb8e6d";
-       revision = "1";
-       editedCabalFile = "415dee42256dec3b5dae7c18bd9bf610ebe55c053d371c8afb994c9525fafa36";
+       version = "0.5.0.0";
+       sha256 = "15e5787791148991d6055ad1269b9d9cb22db04e16b0bd1d266e2f00cec1f4d5";
        libraryHaskellDepends = [
          aeson attoparsec authenticate-oauth base base16-bytestring byteable
          bytestring case-insensitive containers cryptohash exceptions
@@ -184250,7 +185921,7 @@ self: {
          http-client http-types HUnit lens lens-aeson network-info
          QuickCheck snap-core snap-server temporary test-framework
          test-framework-hunit test-framework-quickcheck2 text time
-         transformers unix-compat uuid vector
+         transformers unix-compat unordered-containers uuid vector
        ];
        homepage = "http://www.serpentine.com/wreq";
        description = "An easy-to-use HTTP client library";
@@ -184297,8 +185968,8 @@ self: {
     ({ mkDerivation, base, bytestring, text, utf8-string, wreq }:
      mkDerivation {
        pname = "wreq-stringless";
-       version = "0.4.1.0";
-       sha256 = "f2d80a50007a7f9666d67a3cfe15b8b459c53945c6b1add310d0733246fe41e2";
+       version = "0.5.0.0";
+       sha256 = "e58cb6e6c44b33df3507c1e5fc3f7cea2961a8244c3c6840a085327ce731b921";
        libraryHaskellDepends = [ base bytestring text utf8-string wreq ];
        homepage = "https://github.com/j-keck/wreq-stringless#readme";
        description = "Simple wrapper to use wreq without Strings";
@@ -185539,6 +187210,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "xml-conduit_1_4_0_4" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, bytestring, conduit, conduit-extra, containers
+     , data-default, deepseq, hspec, HUnit, monad-control, resourcet
+     , text, transformers, xml-types
+     }:
+     mkDerivation {
+       pname = "xml-conduit";
+       version = "1.4.0.4";
+       sha256 = "11058279d3f75a71b5731d26fc490f86fc1b7cc461053cd54aedde8f152d52fc";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder blaze-html blaze-markup bytestring
+         conduit conduit-extra containers data-default deepseq monad-control
+         resourcet text transformers xml-types
+       ];
+       testHaskellDepends = [
+         base blaze-markup bytestring conduit containers hspec HUnit
+         resourcet text transformers xml-types
+       ];
+       homepage = "http://github.com/snoyberg/xml";
+       description = "Pure-Haskell utilities for dealing with XML with the conduit package";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xml-conduit-decode" = callPackage
     ({ mkDerivation, base, bifunctors, data-default, lens, semigroups
      , tasty, tasty-hunit, text, time, xml-conduit, xml-types
@@ -185660,6 +187356,8 @@ self: {
        pname = "xml-hamlet";
        version = "0.4.1";
        sha256 = "7df390f59599a0b16831c3f2cbb13ad0bebb92faa4a350fc6ae613bfba4ec2bb";
+       revision = "1";
+       editedCabalFile = "5c9d521224d4f08f59a3dbbde041c4f0267da46528cfc6b24da052387ebd4033";
        libraryHaskellDepends = [
          base containers parsec shakespeare template-haskell text
          xml-conduit
@@ -186371,17 +188069,18 @@ self: {
      }) {};
 
   "xmonad-vanessa" = callPackage
-    ({ mkDerivation, base, containers, process, X11, xmonad
-     , xmonad-contrib, xmonad-extras
+    ({ mkDerivation, base, containers, process, transformers, X11
+     , xmonad, xmonad-contrib, xmonad-extras
      }:
      mkDerivation {
        pname = "xmonad-vanessa";
-       version = "0.1.0.2";
-       sha256 = "40c23ebf4725488ef6548df811f7fe435d43860d6722cbb8bd59a4ea12f7c647";
+       version = "0.1.0.3";
+       sha256 = "2ec997506b554282bbbddf02d9bb72326637ce5c6cd5634604b93a7e6e2b9ffa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers process X11 xmonad xmonad-contrib xmonad-extras
+         base containers process transformers X11 xmonad xmonad-contrib
+         xmonad-extras
        ];
        executableHaskellDepends = [ base ];
        homepage = "https://github.com/vmchale/xmonad-vanessa#readme";
@@ -188374,8 +190073,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-markdown";
-       version = "0.11.2";
-       sha256 = "28a1b1dbcc5a171ee88b8eb1850aef43cf17d03553b29116ca0934721c228ae3";
+       version = "0.11.4";
+       sha256 = "ea2e4c5506543922711ed169c90afe510ddf857276fdd5850e7481a2c181a916";
        libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring directory pandoc persistent
          shakespeare texmath text xss-sanitize yesod-core yesod-form
diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index a0b90962829..b6063f6ef97 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -40,14 +40,14 @@ let
     if !isGhcjs
     then "ghc"
     else "ghcjs";
-  docLibGlob =
+  ghcDocLibDir =
     if !isGhcjs
-    then ''share/doc/ghc*/html/libraries''
-    else ''doc/lib'';
+    then ghc.doc + ''/share/doc/ghc*/html/libraries''
+    else ghc     + ''/doc/lib'';
   # On GHCJS, use a stripped down version of GHC's prologue.txt
   prologue =
     if !isGhcjs
-    then "${ghc.doc}/${docLibGlob}/prologue.txt"
+    then "${ghcDocLibDir}/prologue.txt"
     else writeText "ghcjs-prologue.txt" ''
       This index includes documentation for many Haskell modules.
     '';
@@ -67,7 +67,7 @@ stdenv.mkDerivation {
     mkdir -p $out/share/doc/hoogle
 
     echo importing builtin packages
-    for docdir in ${ghc.doc}/${docLibGlob}/*; do
+    for docdir in ${ghcDocLibDir}/*; do
       name="$(basename $docdir)"
       ${opts isGhcjs ''docdir="$docdir/html"''}
       if [[ -d $docdir ]]; then
diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix
index 24ba50387a4..eb2fa2927ca 100644
--- a/pkgs/development/libraries/agda/agda-stdlib/default.nix
+++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix
@@ -1,14 +1,14 @@
 { stdenv, agda, fetchFromGitHub, ghcWithPackages }:
 
 agda.mkDerivation (self: rec {
-  version = "0.12";
+  version = "0.13";
   name = "agda-stdlib-${version}";
 
   src = fetchFromGitHub {
     repo = "agda-stdlib";
     owner = "agda";
     rev = "v${version}";
-    sha256 = "1n5hn3xa0bqyq8rjvfsfmh6z3l8rr4z3s7gyfmf3kiv9f235bnd2";
+    sha256 = "156xbqvqjck9izz613v52ppwk8s1y0kv7xkjpcm16vys2c3bh0x5";
   };
 
   nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ];
diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix
index be61640553d..fc6b47e8a63 100644
--- a/pkgs/development/libraries/aspell/dictionaries.nix
+++ b/pkgs/development/libraries/aspell/dictionaries.nix
@@ -28,6 +28,15 @@ let
 
 in {
 
+  ca = buildDict {
+    shortName = "ca-2.1.5-1";
+    fullName = "Catalan";
+    src = fetchurl {
+      url = mirror://gnu/aspell/dict/ca/aspell6-ca-2.1.5-1.tar.bz2;
+      sha256 = "1fb5y5kgvk25nlsfvc8cai978hg66x3pbp9py56pldc7vxzf9npb";
+    };
+  };
+
   cs = buildDict {
     shortName = "cs-20040614-1";
     fullName = "Czech";
diff --git a/pkgs/development/libraries/boost/1.63.nix b/pkgs/development/libraries/boost/1.63.nix
new file mode 100644
index 00000000000..c4749bc3ee4
--- /dev/null
+++ b/pkgs/development/libraries/boost/1.63.nix
@@ -0,0 +1,12 @@
+{ stdenv, callPackage, fetchurl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "1.63.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/boost/boost_1_63_0.tar.bz2";
+    # SHA256 from http://www.boost.org/users/history/version_1_63_0.html
+    sha256 = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0";
+  };
+
+})
diff --git a/pkgs/development/libraries/ffmpeg/2.8.nix b/pkgs/development/libraries/ffmpeg/2.8.nix
index 366adfbefca..5e5fef5cd83 100644
--- a/pkgs/development/libraries/ffmpeg/2.8.nix
+++ b/pkgs/development/libraries/ffmpeg/2.8.nix
@@ -1,7 +1,7 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "${branch}.10";
+  version = "${branch}.11";
   branch = "2.8";
-  sha256 = "1jd9vqrsng6swk1xsms3qvwqjzla58xbk3103qmnxkixa1rimkni";
+  sha256 = "0cldkzcbvsnb7mxz3kwpa0mnb44wmlc0qyl01wwi2qznn7vf11wr";
 })
diff --git a/pkgs/development/libraries/ffmpeg/3.1.nix b/pkgs/development/libraries/ffmpeg/3.1.nix
index a3504bf897c..8e79d1ad0e1 100644
--- a/pkgs/development/libraries/ffmpeg/3.1.nix
+++ b/pkgs/development/libraries/ffmpeg/3.1.nix
@@ -5,9 +5,9 @@
 }@args:
 
 callPackage ./generic.nix (args // rec {
-  version = "${branch}.6";
+  version = "${branch}.7";
   branch = "3.1";
-  sha256 = "0c9g9zhrnvbfwwcca35jis7f7njskhzrwa7n7wpd1618cms2kjvx";
+  sha256 = "0ldf484r3waslv0sjx3vcwlkfgh28bd1wqcj26snfhav7zkf10kl";
   darwinFrameworks = [ Cocoa CoreMedia ];
   patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch;
 })
diff --git a/pkgs/development/libraries/ffmpeg/3.2.nix b/pkgs/development/libraries/ffmpeg/3.2.nix
index 7587ca7c3ca..17ed6fb0e4b 100644
--- a/pkgs/development/libraries/ffmpeg/3.2.nix
+++ b/pkgs/development/libraries/ffmpeg/3.2.nix
@@ -5,9 +5,9 @@
 }@args:
 
 callPackage ./generic.nix (args // rec {
-  version = "${branch}.2";
+  version = "${branch}.4";
   branch = "3.2";
-  sha256 = "0srn788i4k5827sl8vmds6133vjy9ygsmgzwn40n3l5qs5b9l4hb";
+  sha256 = "194n8hwmz2rpgh2rz8bc3mnxjyj3jh090mqp7k76msg9la9kbyn0";
   darwinFrameworks = [ Cocoa CoreMedia ];
   patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch;
 })
diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix
index 7d58bfcd67f..a5076b9d498 100644
--- a/pkgs/development/libraries/gnutls/3.5.nix
+++ b/pkgs/development/libraries/gnutls/3.5.nix
@@ -1,11 +1,11 @@
 { callPackage, fetchurl, libunistring, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.5.8";
+  version = "3.5.9";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz";
-    sha256 = "1zyl2z63s68hx1dpxqx0lykmlf3rwrzlrf44sq3h7dvjmr1z55qf";
+    sha256 = "0l9971841jsfdcvcyhas17sk5rsby6x5vvwcmmj4x3zi9q60zcc2";
   };
 
   buildInputs = [ libunistring ];
diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix
index d9e438da131..dbc5c1e2ae9 100644
--- a/pkgs/development/libraries/libivykis/default.nix
+++ b/pkgs/development/libraries/libivykis/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "libivykis-${version}";
 
-  version = "0.40";
+  version = "0.41";
 
   src = fetchurl {
     url = "mirror://sourceforge/libivykis/${version}/ivykis-${version}.tar.gz";
-    sha256 = "1rn32dijv0pn9y2mbdg1n7al4h4i5pwwhhihr9pyakwyb6qgmqxj";
+    sha256 = "1igk3svf36i5xgb6ipc507xpj6zjm4xi9j1j2cdqaachllwlb4rc";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
new file mode 100644
index 00000000000..3a00408c7ca
--- /dev/null
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, libmsgpack
+, libvpx, check, libconfig, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "libtoxcore-${version}";
+  version = "0.1.6";
+
+  src = fetchFromGitHub {
+    owner  = "TokTok";
+    repo   = "c-toxcore";
+    rev    = "v${version}";
+    sha256 = "0a00gjar6ibaqa2cm81867nk7chsd141v360268v7ym2mxwa0ya6";
+  };
+
+  cmakeFlags = [
+    "-DBUILD_NTOX=ON"
+    "-DDHT_BOOTSTRAP=ON"
+    "-DBOOTSTRAP_DAEMON=ON"
+  ];
+
+  buildInputs = [
+    libsodium libmsgpack ncurses
+  ] ++ stdenv.lib.optionals (!stdenv.isArm) [
+    libopus
+    libvpx
+  ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+  checkInputs = [ check ];
+
+  checkPhase = "ctest";
+
+  # for some reason the tests are not running - it says "No tests found!!"
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "P2P FOSS instant messaging application aimed to replace Skype with crypto";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/libtoxcore/new-api/default.nix b/pkgs/development/libraries/libtoxcore/new-api.nix
similarity index 98%
rename from pkgs/development/libraries/libtoxcore/new-api/default.nix
rename to pkgs/development/libraries/libtoxcore/new-api.nix
index b88f4f6a74e..8d0a467c82a 100644
--- a/pkgs/development/libraries/libtoxcore/new-api/default.nix
+++ b/pkgs/development/libraries/libtoxcore/new-api.nix
@@ -2,7 +2,7 @@
 , libvpx, check, libconfig, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "tox-core-dev-20160727";
+  name = "tox-core-new-20160727";
 
   src = fetchFromGitHub {
     owner  = "irungentoo";
diff --git a/pkgs/development/libraries/libtoxcore/old-api/default.nix b/pkgs/development/libraries/libtoxcore/old-api.nix
similarity index 94%
rename from pkgs/development/libraries/libtoxcore/old-api/default.nix
rename to pkgs/development/libraries/libtoxcore/old-api.nix
index 2fb5e93eab9..5757e94559a 100644
--- a/pkgs/development/libraries/libtoxcore/old-api/default.nix
+++ b/pkgs/development/libraries/libtoxcore/old-api.nix
@@ -4,9 +4,9 @@
 let
   version = "4c220e336330213b151a0c20307d0a1fce04ac9e";
   date = "20150126";
-in
-stdenv.mkDerivation rec {
-  name = "tox-core-${date}-${builtins.substring 0 7 version}";
+
+in stdenv.mkDerivation rec {
+  name = "tox-core-old-${date}-${builtins.substring 0 7 version}";
 
   src = fetchFromGitHub {
     owner  = "irungentoo";
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 7b413fa92d1..2591a43f1d4 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -115,8 +115,8 @@ in {
   };
 
   openssl_1_1_0 = common {
-    version = "1.1.0d";
-    sha256 = "1pv0zql3r73qpjini90hn29l28d65b7i777zav0larbmi6gbnpkx";
+    version = "1.1.0e";
+    sha256 = "0k47sdd9gs6yxfv6ldlgpld2lyzrkcv9kz4cf88ck04xjwc8dgjp";
   };
 
   openssl_1_0_2-steam = common {
diff --git a/pkgs/development/libraries/webkitgtk/2.12.nix b/pkgs/development/libraries/webkitgtk/2.12.nix
deleted file mode 100644
index 04ab4d96773..00000000000
--- a/pkgs/development/libraries/webkitgtk/2.12.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake
-, pkgconfig, gettext, gobjectIntrospection, libnotify
-, gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core
-, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs
-, enableGeoLocation ? true, geoclue2, sqlite
-, gst-plugins-base
-}:
-
-assert enableGeoLocation -> geoclue2 != null;
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
-  name = "webkitgtk-${version}";
-  version = "2.12.5";
-
-  meta = {
-    description = "Web content rendering engine, GTK+ port";
-    homepage = "http://webkitgtk.org/";
-    license = licenses.bsd2;
-    platforms = platforms.linux;
-    hydraPlatforms = [];
-    maintainers = with maintainers; [ koral ];
-  };
-
-  preConfigure = "patchShebangs Tools";
-
-  src = fetchurl {
-    url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "0h0wig413399wws6l88mn1nnjbqb42vb55yvz8az39b4p1a7h53b";
-  };
-
-  patches = [ ./finding-harfbuzz-icu.patch ];
-
-  cmakeFlags = [ "-DPORT=GTK" "-DUSE_LIBHYPHEN=0" ];
-
-  # XXX: WebKit2 missing include path for gst-plugins-base.
-  # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894
-  NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0";
-
-  nativeBuildInputs = [
-    cmake perl python2 ruby bison gperf sqlite
-    pkgconfig gettext gobjectIntrospection
-  ];
-
-  buildInputs = [
-    gtk2 wayland libwebp enchant libnotify
-    libxml2 libsecret libxslt harfbuzz libpthreadstubs
-    gst-plugins-base libxkbcommon epoxy at_spi2_core
-  ] ++ optional enableGeoLocation geoclue2
-    ++ (with xlibs; [ libXdmcp libXt libXtst ]);
-
-  propagatedBuildInputs = [
-    libsoup gtk3
-  ];
-
-  enableParallelBuilding = true;
-}
diff --git a/pkgs/development/libraries/webkitgtk/2.14.nix b/pkgs/development/libraries/webkitgtk/2.14.nix
index 2af7133bf2b..99a41ec0c18 100644
--- a/pkgs/development/libraries/webkitgtk/2.14.nix
+++ b/pkgs/development/libraries/webkitgtk/2.14.nix
@@ -12,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.14.3";
+  version = "2.14.5";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "0v0hkvggxi38cdb3v672qwr0m0y3x2rmnwh8j3q28869li8d9shb";
+    sha256 = "17rnjs7yl198bkghzcc2cgh30sb5i03irb6wag3xchwv7b1z3a1w";
   };
 
   # see if we can clean this up....
diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix
new file mode 100644
index 00000000000..1233b94dccd
--- /dev/null
+++ b/pkgs/development/python-modules/aenum/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchPypi, buildPythonPackage }:
+
+buildPythonPackage rec {
+  pname = "aenum";
+  version = "1.4.7";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1bvn2k53nz99fiwql5fkl0fh7xjw8ama9qzdjp36609mpk05ikl8";
+  };
+
+  meta = {
+    description = "Advanced Enumerations (compatible with Python's stdlib Enum), NamedTuples, and NamedConstants";
+    maintainer = with stdenv.lib.maintainers; [ vrthra ];
+    license = with stdenv.lib.licenses; [ bsd3 ];
+    homepage = https://bitbucket.org/stoneleaf/aenum;
+  };
+}
diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
new file mode 100644
index 00000000000..65c72ca9831
--- /dev/null
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -0,0 +1,43 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pytest
+, pytestcov
+, pytestpep8
+, pytest_xdist
+, six
+, Theano
+, pyyaml
+}:
+
+buildPythonPackage rec {
+  pname = "Keras";
+  version = "1.2.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0bby93sffjadrxnx9j9nn2lq0ygsgqjp16260c6lz77b6r1qrcfj";
+  };
+
+  checkInputs = [
+    pytest
+    pytestcov
+    pytestpep8
+    pytest_xdist
+  ];
+
+  propagatedBuildInputs = [
+    six Theano pyyaml
+  ];
+
+  # Couldn't get tests working
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Deep Learning library for Theano and TensorFlow";
+    homepage = "https://keras.io";
+    license = licenses.mit;
+    maintainers = with maintainers; [ NikolaMandic ];
+  };
+}
diff --git a/pkgs/development/python-modules/leather/default.nix b/pkgs/development/python-modules/leather/default.nix
new file mode 100644
index 00000000000..e7c67819ed7
--- /dev/null
+++ b/pkgs/development/python-modules/leather/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchPypi, buildPythonPackage, six }:
+
+buildPythonPackage rec {
+  pname = "leather";
+  version = "0.3.3";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "125r372q7bwcajfdysp7w5zh5wccwxf1mkhqawl8h518nl1icv87";
+  };
+
+  propagatedBuildInputs = [ six ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://leather.rtfd.io";
+    description = "Python charting library";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ vrthra ];
+  };
+}
diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix
new file mode 100644
index 00000000000..8f3b2ef74b2
--- /dev/null
+++ b/pkgs/development/python-modules/scrapy/default.nix
@@ -0,0 +1,38 @@
+{ buildPythonPackage, fetchurl, glibcLocales, mock, pytest, botocore,
+  testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl,
+  service-identity, parsel, pydispatcher, cssselect, lib }:
+buildPythonPackage rec {
+    name = "Scrapy-${version}";
+    version = "1.3.1";
+
+    buildInputs = [ glibcLocales mock pytest botocore testfixtures pillow ];
+    propagatedBuildInputs = [
+      six twisted w3lib lxml cssselect queuelib pyopenssl service-identity parsel pydispatcher
+    ];
+
+    # Scrapy is usually installed via pip where copying all
+    # permissions makes sense. In Nix the files copied are owned by
+    # root and readonly. As a consequence scrapy can't edit the
+    # project templates.
+    patches = [ ./permissions-fix.patch ];
+
+    LC_ALL="en_US.UTF-8";
+
+    checkPhase = ''
+      py.test --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py
+      # The ignored tests require mitmproxy, which depends on protobuf, but it's disabled on Python3
+    '';
+
+    src = fetchurl {
+      url = "mirror://pypi/S/Scrapy/${name}.tar.gz";
+      sha256 = "0s5qkxwfq842maxjd2j82ldp4dyb70kla3z5rr56z0p7ig53cbvk";
+    };
+
+    meta = with lib; {
+      description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages";
+      homepage = "http://scrapy.org/";
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ drewkett ];
+      platforms = platforms.linux;
+    };
+}
diff --git a/pkgs/development/python-modules/scrapy/permissions-fix.patch b/pkgs/development/python-modules/scrapy/permissions-fix.patch
new file mode 100644
index 00000000000..5ea5269c799
--- /dev/null
+++ b/pkgs/development/python-modules/scrapy/permissions-fix.patch
@@ -0,0 +1,28 @@
+diff --git a/scrapy/commands/startproject.py b/scrapy/commands/startproject.py
+index 5941066..89f8edb 100644
+--- a/scrapy/commands/startproject.py
++++ b/scrapy/commands/startproject.py
+@@ -4,7 +4,7 @@ import os
+ import string
+ from importlib import import_module
+ from os.path import join, exists, abspath
+-from shutil import ignore_patterns, move, copy2, copystat
++from shutil import ignore_patterns, move, copyfile, copystat
+ 
+ import scrapy
+ from scrapy.commands import ScrapyCommand
+@@ -76,8 +76,7 @@ class Command(ScrapyCommand):
+             if os.path.isdir(srcname):
+                 self._copytree(srcname, dstname)
+             else:
+-                copy2(srcname, dstname)
+-        copystat(src, dst)
++                copyfile(srcname, dstname)
+ 
+     def run(self, args, opts):
+         if len(args) not in (1, 2):
+@@ -118,4 +117,3 @@ class Command(ScrapyCommand):
+         _templates_base_dir = self.settings['TEMPLATES_DIR'] or \
+             join(scrapy.__path__[0], 'templates')
+         return join(_templates_base_dir, 'project')
+-    
diff --git a/pkgs/development/python-modules/tensorflow/cuda.nix b/pkgs/development/python-modules/tensorflow/cuda.nix
new file mode 100644
index 00000000000..05a4cc3e4c1
--- /dev/null
+++ b/pkgs/development/python-modules/tensorflow/cuda.nix
@@ -0,0 +1,52 @@
+{ stdenv
+, fetchurl
+, buildPythonPackage
+, swig
+, numpy
+, six
+, protobuf3_0
+, cudatoolkit75
+, cudnn5_cudatoolkit75
+, gcc49
+, zlib
+, linuxPackages
+, mock
+}:
+
+buildPythonPackage rec {
+  pname = "tensorflow";
+  version = "0.11.0rc0";
+  name = "${pname}-${version}";
+  format = "wheel";
+
+  src = fetchurl {
+    url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-${version}-cp27-none-linux_x86_64.whl";
+    sha256 = "1r8zlz95sw7bnjzg5zdbpa9dj8wmp8cvvgyl9sv3amsscagnnfj5";
+  };
+
+  buildInputs = [ swig ];
+  propagatedBuildInputs = [ numpy six protobuf3_0 cudatoolkit75 cudnn5_cudatoolkit75 gcc49 mock ];
+
+  # Note that we need to run *after* the fixup phase because the
+  # libraries are loaded at runtime. If we run in preFixup then
+  # patchelf --shrink-rpath will remove the cuda libraries.
+  postFixup = let
+    rpath = stdenv.lib.makeLibraryPath [
+      gcc49.cc.lib
+      zlib cudatoolkit75
+      cudnn5_cudatoolkit75
+      linuxPackages.nvidia_x11
+    ];
+  in ''
+    find $out -name '*.so' -exec patchelf --set-rpath "${rpath}" {} \;
+  '';
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "TensorFlow helps the tensors flow (no gpu support)";
+    homepage = http://tensorflow.org;
+    license = licenses.asl20;
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
new file mode 100644
index 00000000000..f8bc35eb568
--- /dev/null
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -0,0 +1,48 @@
+{ stdenv
+, fetchurl
+, buildPythonPackage
+, numpy
+, six
+, protobuf3_0_0b2
+, swig
+, mock
+, gcc
+, zlib
+}:
+
+# tensorflow is built from a downloaded wheel, because the upstream
+# project's build system is an arcane beast based on
+# bazel. Untangling it and building the wheel from source is an open
+# problem.
+
+buildPythonPackage rec {
+  pname = "tensorflow";
+  version = "0.10.0";
+  name = "${pname}-${version}";
+  format = "wheel";
+
+  src = fetchurl {
+    url = if stdenv.isDarwin then
+      "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-py2-none-any.whl" else
+      "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-${version}-cp27-none-linux_x86_64.whl";
+    sha256 = if stdenv.isDarwin then
+      "1gjybh3j3rn34bzhsxsfdbqgsr4jh50qyx2wqywvcb24fkvy40j9" else
+      "0g05pa4z6kdy0giz7hjgjgwf4zzr5l8cf1zh247ymixlikn3fnpx";
+  };
+
+  propagatedBuildInputs = [ numpy six protobuf3_0_0b2 swig mock];
+
+  preFixup = ''
+    RPATH="${stdenv.lib.makeLibraryPath [ gcc.cc.lib zlib ]}"
+    find $out -name '*.so' -exec patchelf --set-rpath "$RPATH" {} \;
+  '';
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "TensorFlow helps the tensors flow (no gpu support)";
+    homepage = http://tensorflow.org;
+    license = licenses.asl20;
+    platforms = with platforms; linux ++ darwin;
+  };
+}
diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix
index fa77890655e..c2268ba8da2 100644
--- a/pkgs/development/tools/misc/opengrok/default.nix
+++ b/pkgs/development/tools/misc/opengrok/default.nix
@@ -1,11 +1,22 @@
 { fetchurl, stdenv, jre, ctags, makeWrapper, coreutils, git }:
 
 stdenv.mkDerivation rec {
-  name = "opengrok-0.12.1";
+  name = "opengrok-${version}";
+  version = "0.12.5";
 
+  # 0.12.5 is the latest distributed as a .tar.gz file.
+  # Newer are distribued as .zip so a source build is required.
+
+  # if builded from source
+  #src = fetchurl {
+  #  url = "https://github.com/OpenGrok/OpenGrok/archive/${version}.tar.gz";
+  #  sha256 = "01r7ipnj915rnyxyqrnmjfagkip23q5lx9g787qb7qrnbvgfi118";
+  #};
+
+  # binary distribution
   src = fetchurl {
-    url = "http://java.net/projects/opengrok/downloads/download/${name}.tar.gz";
-    sha256 = "0ihaqgf1z2gsjmy2q96m0s07dpnh92j3ss3myiqjdsh9957fwg79";
+    url = https://github.com/OpenGrok/OpenGrok/files/213268/opengrok-0.12.1.5.tar.gz;
+    sha256 = "c3ce079f6ed1526c475cb4b9a7aa901f75507318c93b436d6c14eba4098e4ead";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
index 5640aa80576..320af7cb0ba 100644
--- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
+++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.8";
+  version = "4.9.10";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha512 = "39r4hq5f70nc1v8qq4qvnd0fq98h4akm6y6zp7ml6mi5knz7v6zm86ykq87a0ph3zh23msimi4155354qcsmsxp4cbd22cq8s1w86ds";
+    sha512 = "1mqlw5x7ryqb1jlhkn31p5xhilmqi55j5307i94xdj1xgn2411fiym5mpx1h8b0jc42g728jl896qplkrbd682vz5wci7fg4022ry81";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 7e1ec3b9941..33f11ad5ae3 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -95,9 +95,9 @@ rec {
   };
 
   grsecurity_testing = grsecPatch
-    { kver   = "4.9.8";
-      grrev  = "201702071801";
-      sha512 = "05hxn9jzkywd15iqjd7lykj0f9czw0kq1rs7krxnrk4lhr4k4ahbhq4330mw4pwcvln4ys25dw7mbljn9zvymb7b1kc3m301rrbgj5f";
+    { kver   = "4.9.10";
+      grrev  = "201702152052";
+      sha512 = "3whjlrm06r724q9lkycm2jalv3wm9bhxjlvgnglrfnc48rnv3b4j2m6gnq396pc3axnd2mpiinlwjwarw59dhs9qax9l7ddcc3cxd4k";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 10181de159f..323b0b50000 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig which makeWrapper hexdump ];
 
-  buildInputs = [ knot-dns lmdb luajit libuv gnutls ]
+  buildInputs = [ knot-dns luajit libuv gnutls ]
+    ++ optional stdenv.isLinux lmdb # system lmdb causes some problems on Darwin
     ## optional dependencies
     ++ optional doInstallCheck cmocka
     ++ optional stdenv.isLinux systemd # socket activation
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index a5fc6e4d94e..5d7a75b2013 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "prometheus-${version}";
-  version = "1.4.1";
+  version = "1.5.2";
   rev = "v${version}";
 
   goPackagePath = "github.com/prometheus/prometheus";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "prometheus";
     repo = "prometheus";
-    sha256 = "05yd3y1b0406qdmx7p27pya9kzcrv66069z1y8dqwj3bf9c7csnm";
+    sha256 = "1b24nx6gmx2c7fj92p2byla3i0zs6xwymxqji00gvgpxr8bsfhn1";
   };
 
   docheck = true;
@@ -36,7 +36,7 @@ buildGoPackage rec {
     description = "Service monitoring system and time series database";
     homepage = http://prometheus.io;
     license = licenses.asl20;
-    maintainers = with maintainers; [ benley ];
+    maintainers = with maintainers; [ benley fpletz ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index 59f2b4ac5cf..e50ecf60567 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, lua }:
 
 stdenv.mkDerivation rec {
-  version = "3.2.5";
+  version = "3.2.7";
   name = "redis-${version}";
 
   src = fetchurl {
     url = "http://download.redis.io/releases/${name}.tar.gz";
-    sha256 = "05ak12xfkcinky6wvhy77knzd95m4vlshwka6jrdcjfqxyqww2c5";
+    sha256 = "1abghfr9nq5k69vg0kjh2409k51xy6fhyf466gy7pzjb6zjz77dz";
   };
 
   buildInputs = [ lua ];
diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix
index b6185631551..da269049b2c 100644
--- a/pkgs/tools/admin/gtk-vnc/default.nix
+++ b/pkgs/tools/admin/gtk-vnc/default.nix
@@ -8,11 +8,11 @@ let
   inherit (pythonPackages) pygobject3 python;
 in stdenv.mkDerivation rec {
   name = "gtk-vnc-${version}";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtk-vnc/0.6/${name}.tar.xz";
-    sha256 = "9559348805e64d130dae569fee466930175dbe150d2649bb868b5c095f130433";
+    url = "mirror://gnome/sources/gtk-vnc/${stdenv.lib.strings.substring 0 3 version}/${name}.tar.xz";
+    sha256 = "0gj8dpy3sj4dp810gy67spzh5f0jd8aqg69clcwqjcskj1yawbiw";
   };
 
   buildInputs = [
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 1c1085ff814..508fc781069 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -1,6 +1,7 @@
 { stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3
 , obex_data_server, xdg_utils, libnotify, dconf, gsettings_desktop_schemas, dnsmasq, dhcp
-, hicolor_icon_theme , withPulseAudio ? true, libpulseaudio }:
+, hicolor_icon_theme, librsvg
+, withPulseAudio ? true, libpulseaudio }:
 
 let
   binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp ];
@@ -16,7 +17,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ intltool pkgconfig pythonPackages.wrapPython pythonPackages.cython ];
 
-  buildInputs = [ bluez gtk3 pythonPackages.python libnotify dconf
+  buildInputs = [ bluez gtk3 pythonPackages.python libnotify dconf librsvg
                   gsettings_desktop_schemas hicolor_icon_theme ]
                 ++ pythonPath
                 ++ lib.optional withPulseAudio libpulseaudio;
diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix
index 577c0a33b3e..f3d2cbca651 100644
--- a/pkgs/tools/misc/aspcud/default.nix
+++ b/pkgs/tools/misc/aspcud/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  version = "1.9.0";
+  version = "1.9.1";
 in
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/project/potassco/aspcud/${version}/aspcud-${version}-source.tar.gz";
-    sha256 = "029035vcdk527ssf126i8ipi5zs73gqpbrg019pvm9r24rf0m373";
+    sha256 = "09sqbshwrqz2fvlkz73mns5i3m70fh8mvwhz8450izy5lsligsg0";
   };
 
   buildInputs = [ boost clasp cmake gringo re2c ];
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index efc73e5aa4f..307b1a1592a 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -15,11 +15,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2017.02.04.1";
+  version = "2017.02.16";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "1aqca4mxgdjiv1qfnzqxx6lpwggfxsaahvvs235pyz0j3kywa4nj";
+    sha256 = "21a5014f25d8ad2882999dd8cbf8cc2fd13c42116f5fe7b4781c982421ea59b0";
   };
 
   buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;
diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix
index 29b1ec5f39c..05e833f2f8e 100644
--- a/pkgs/tools/networking/toxvpn/default.nix
+++ b/pkgs/tools/networking/toxvpn/default.nix
@@ -1,31 +1,23 @@
-{ stdenv, fetchFromGitHub, libtoxcore, cmake, jsoncpp, lib, stdenvAdapters, libsodium, systemd, enableDebugging, libcap }:
+{ stdenv, fetchFromGitHub, cmake, lib
+, libtoxcore, jsoncpp, libsodium, systemd, libcap }:
 
 with lib;
 
-let
-  libtoxcoreLocked = stdenv.lib.overrideDerivation libtoxcore (oldAttrs: {
-    name = "libtoxcore-2016-09-07";
-    src = fetchFromGitHub {
-      owner  = "TokTok";
-      repo   = "toxcore";
-      rev    = "3521898b0cbf398d882496f6382f6c4ea1c23bc1";
-      sha256 = "1jvf0v9cqwd4ssj1iarhgsr05qg48v7yvmbnn3k01jy0lqci8iaq";
-    };
-  });
-
-in stdenv.mkDerivation {
-  name = "toxvpn-2016-09-09";
+stdenv.mkDerivation rec {
+  name = "toxvpn-${version}";
+  version = "20161230";
 
   src = fetchFromGitHub {
     owner  = "cleverca22";
     repo   = "toxvpn";
-    rev    = "6e188f26fff8bddc1014ee3cc7a7423f9f344a09";
-    sha256 = "1bshc6pzk7z7q7g17cwx9gmlcyzn4szqvdiy0ihbk2xmx9k31c6p";
+    rev    = "4b7498a5fae680484cb5779ac01fb08ad3089bdd";
+    sha256 = "0bazdspiym9xyzms7pd6i1f2gph13rnf764nm3jc27fbfwmc98rp";
   };
 
-  buildInputs = [ cmake libtoxcoreLocked jsoncpp libsodium libcap ] ++ optional (systemd != null) systemd;
+  buildInputs = [ libtoxcore jsoncpp libsodium libcap ] ++ optional stdenv.isLinux systemd;
+  nativeBuildInputs = [ cmake ];
 
-  cmakeFlags = optional (systemd != null) [ "-DSYSTEMD=1" ];
+  cmakeFlags = optional stdenv.isLinux [ "-DSYSTEMD=1" ];
 
   meta = with stdenv.lib; {
     description = "A powerful tool that allows one to make tunneled point to point connections over Tox";
diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
index 6c5cb467a8f..f37940c65c1 100644
--- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
+++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
@@ -37,12 +37,11 @@ in rec {
   nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [git coreutils];
   nix-prefetch-hg  = mkPrefetchScript "hg"  ../../../build-support/fetchhg/nix-prefetch-hg   [mercurial];
   nix-prefetch-svn = mkPrefetchScript "svn" ../../../build-support/fetchsvn/nix-prefetch-svn [subversion.out];
-  nix-prefetch-zip = mkPrefetchScript "zip" ../../../build-support/fetchzip/nix-prefetch-zip [unzip curl.bin];
 
   nix-prefetch-scripts = buildEnv {
     name = "nix-prefetch-scripts";
 
-    paths = [ nix-prefetch-bzr nix-prefetch-cvs nix-prefetch-git nix-prefetch-hg nix-prefetch-svn nix-prefetch-zip ];
+    paths = [ nix-prefetch-bzr nix-prefetch-cvs nix-prefetch-git nix-prefetch-hg nix-prefetch-svn ];
 
     meta = with stdenv.lib; {
       description = "Collection of all the nix-prefetch-* scripts which may be used to obtain source hashes";
diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
index bba392e30e7..820bcbb9a35 100644
--- a/pkgs/tools/package-management/nixops/default.nix
+++ b/pkgs/tools/package-management/nixops/default.nix
@@ -1,9 +1,9 @@
 { callPackage, fetchurl }:
 
 callPackage ./generic.nix (rec {
-  version = "1.4";
+  version = "1.5";
   src = fetchurl {
     url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
-    sha256 = "1a6vkn8rh5lgalxh6cwr4894n3yp7f2qxcbcjv42nnmy5g4fy5fd";
+    sha256 = "0z4pzc55wjab8v4bkrff94f8qp1g9ydgxxpl2dvy5130bg1s52wd";
   };
 })
diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix
index 87ed6295977..4d67e8a5d6f 100644
--- a/pkgs/tools/package-management/nixops/generic.nix
+++ b/pkgs/tools/package-management/nixops/generic.nix
@@ -23,8 +23,10 @@ python2Packages.buildPythonApplication {
       azure-mgmt-resource
       azure-mgmt-storage
       adal
-      pysqlite  # Go back to builtin sqlite once Python 2.7.13 is released
+      # Go back to sqlite once Python 2.7.13 is released
+      pysqlite
       datadog
+      digital-ocean
     ];
 
   doCheck = false;
diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix
index fb5791be239..820bcbb9a35 100644
--- a/pkgs/tools/package-management/nixops/unstable.nix
+++ b/pkgs/tools/package-management/nixops/unstable.nix
@@ -1,10 +1,9 @@
 { callPackage, fetchurl }:
 
 callPackage ./generic.nix (rec {
-  version = "2016-11-23";
+  version = "1.5";
   src = fetchurl {
-    # Hydra doesn't serve production outputs anymore :(
-    url = "https://static.domenkozar.com/nixops-1.5pre0_abcdef.tar.bz2";
-    sha256 = "1a4cyd3zvkdjg9rf9ssr7p4i6r89zr483v5nlr5jzjdjjyi3j2bz";
+    url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
+    sha256 = "0z4pzc55wjab8v4bkrff94f8qp1g9ydgxxpl2dvy5130bg1s52wd";
   };
 })
diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix
index ab4867a4cc8..f8ef409813c 100644
--- a/pkgs/tools/security/ecryptfs/default.nix
+++ b/pkgs/tools/security/ecryptfs/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
     FILES="$(grep -r '/bin/sh' src/utils -l; find src -name \*.c)"
     for file in $FILES; do
       substituteInPlace "$file" \
+        --replace /bin/mount ${utillinux}/bin/mount \
+        --replace /bin/umount ${utillinux}/bin/umount \
         --replace /sbin/mount.ecryptfs_private ${wrapperDir}/mount.ecryptfs_private \
         --replace /sbin/umount.ecryptfs_private ${wrapperDir}/umount.ecryptfs_private \
         --replace /sbin/mount.ecryptfs $out/sbin/mount.ecryptfs \
@@ -26,8 +28,6 @@ stdenv.mkDerivation rec {
         --replace /usr/bin/ecryptfs-setup-private $out/bin/ecryptfs-setup-private \
         --replace /sbin/cryptsetup ${cryptsetup}/sbin/cryptsetup \
         --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup \
-        --replace /bin/mount ${utillinux}/bin/mount \
-        --replace /bin/umount ${utillinux}/bin/umount \
         --replace /sbin/unix_chkpwd ${wrapperDir}/unix_chkpwd \
         --replace /bin/bash ${bash}/bin/bash
     done
diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix
index 004b2b58fa3..b72673167bc 100644
--- a/pkgs/tools/system/syslog-ng-incubator/default.nix
+++ b/pkgs/tools/system/syslog-ng-incubator/default.nix
@@ -1,25 +1,25 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, syslogng
-, eventlog, perl, python, yacc, riemann_c_client, libivykis, protobufc
+, eventlog, perl, python, yacc, protobufc, libivykis
 }:
 
 stdenv.mkDerivation rec {
   name = "syslog-ng-incubator-${version}";
-  version = "141106-54179c5";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "balabit";
     repo = "syslog-ng-incubator";
-    rev = "54179c5f733487fe97ee856bc27130d0b09f3d5a";
-    sha256 = "1y099f7pdan1441ycycd67igcwbla2m2cgnxjfvdw76llvi35sam";
+    rev = name;
+    sha256 = "00j123ya0xfj1jicaqnk1liffx07mhhf0r406pabxjjj97gy8nlk";
   };
 
+  nativeBuildInputs = [ pkgconfig autoreconfHook yacc ];
+
   buildInputs = [
-    autoreconfHook pkgconfig glib syslogng eventlog perl python
-    yacc riemann_c_client libivykis protobufc
+    glib syslogng eventlog perl python protobufc libivykis
   ];
 
   configureFlags = [
-    "--without-ivykis"
     "--with-module-dir=$(out)/lib/syslog-ng"
   ];
 
@@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     maintainers = [ maintainers.rickynils ];
     platforms = platforms.linux;
+    broken = true; # does not work with our new syslog-ng version yet
   };
 }
diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix
index 7c7d5df4df8..4e1fb671957 100644
--- a/pkgs/tools/system/syslog-ng/default.nix
+++ b/pkgs/tools/system/syslog-ng/default.nix
@@ -1,29 +1,62 @@
-{ stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl
-, riemann_c_client, protobufc, pcre, yacc }:
+{ stdenv, fetchurl, openssl, libcap, curl, which
+, eventlog, pkgconfig, glib, python, systemd, perl
+, riemann_c_client, protobufc, pcre, libnet
+, json_c, libuuid, libivykis, mongoc, rabbitmq-c }:
+
+let
+  pname = "syslog-ng";
+in
 
 stdenv.mkDerivation rec {
-  name = "syslog-ng-${version}";
-
-  version = "3.6.2";
+  name = "${pname}-${version}";
+  version = "3.9.1";
 
   src = fetchurl {
-    url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/${version}/source/syslog-ng_${version}.tar.gz";
-    sha256 = "0qc21mwajk6xrra3gqy2nvaza5gq62psamq4ayphj7lqabdglizg";
+    url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz";
+    sha256 = "05qaqw115py5iz55vmc0j1xcwcpr8wa9vpmbixhr1rqaamm8ay2n";
   };
 
-  buildInputs = [ eventlog pkgconfig glib python systemd perl riemann_c_client protobufc yacc pcre ];
+  nativeBuildInputs = [ pkgconfig which ];
+
+  buildInputs = [
+    libcap
+    curl
+    openssl
+    eventlog
+    glib
+    perl
+    python
+    systemd
+    riemann_c_client
+    protobufc
+    pcre
+    libnet
+    json_c
+    libuuid
+    libivykis
+    mongoc
+    rabbitmq-c
+  ];
 
   configureFlags = [
+    "--enable-manpages"
     "--enable-dynamic-linking"
     "--enable-systemd"
+    "--with-ivykis=system"
+    "--with-librabbitmq-client=system"
+    "--with-mongoc=system"
+    "--with-jsonc=system"
+    "--with-systemd-journal=system"
     "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
   ];
 
+  outputs = [ "out" "man" ];
+
   meta = with stdenv.lib; {
     homepage = "http://www.balabit.com/network-security/syslog-ng/";
     description = "Next-generation syslogd with advanced networking and filtering capabilities";
     license = licenses.gpl2;
-    maintainers = [ maintainers.rickynils ];
+    maintainers = with maintainers; [ rickynils  fpletz ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ba672c477d..f135d5edaf7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -548,7 +548,7 @@ with pkgs;
   aria = aria2;
 
   aspcud = callPackage ../tools/misc/aspcud {
-    boost = boost155;
+    boost = boost163;
   };
 
   at = callPackage ../tools/system/at { };
@@ -2013,12 +2013,6 @@ with pkgs;
     libdevil = libdevil-nox;
   };
 
-  /* Readded by Michael Raskin. There are programs in the wild
-   * that do want 2.0 but not 2.22. Please give a day's notice for
-   * objections before removal. The feature is integer coordinates
-   */
-  graphviz_2_0 = callPackage ../tools/graphics/graphviz/2.0.nix { };
-
   /* Readded by Michael Raskin. There are programs in the wild
    * that do want 2.32 but not 2.0 or 2.36. Please give a day's notice for
    * objections before removal. The feature is libgraph.
@@ -6925,6 +6919,7 @@ with pkgs;
   boost159 = callPackage ../development/libraries/boost/1.59.nix { };
   boost160 = callPackage ../development/libraries/boost/1.60.nix { };
   boost162 = callPackage ../development/libraries/boost/1.62.nix { };
+  boost163 = callPackage ../development/libraries/boost/1.63.nix { };
   boost = boost162;
 
   boost_process = callPackage ../development/libraries/boost-process { };
@@ -8576,9 +8571,11 @@ with pkgs;
 
   libtorrentRasterbar_1_0 = callPackage ../development/libraries/libtorrent-rasterbar/1.0.nix { };
 
-  libtoxcore = callPackage ../development/libraries/libtoxcore/old-api { };
+  libtoxcore-old = callPackage ../development/libraries/libtoxcore/old-api.nix { };
 
-  libtoxcore-dev = callPackage ../development/libraries/libtoxcore/new-api { };
+  libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { };
+
+  libtoxcore = callPackage ../development/libraries/libtoxcore { };
 
   libtap = callPackage ../development/libraries/libtap { };
 
@@ -9842,11 +9839,6 @@ with pkgs;
     gst-plugins-base = gst_all_1.gst-plugins-base;
   };
 
-  webkitgtk212x = callPackage ../development/libraries/webkitgtk/2.12.nix {
-    harfbuzz = harfbuzz-icu;
-    gst-plugins-base = gst_all_1.gst-plugins-base;
-  };
-
   webkitgtk2 = webkitgtk24x.override {
     withGtk2 = true;
     enableIntrospection = false;
@@ -14629,7 +14621,9 @@ with pkgs;
 
   telegram-purple = callPackage ../applications/networking/instant-messengers/pidgin-plugins/telegram-purple { };
 
-  toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl { };
+  toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl {
+    libtoxcore = libtoxcore-new;
+  };
 
   pidgin-opensteamworks = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks { };
 
@@ -14813,7 +14807,9 @@ with pkgs;
 
   ratmen = callPackage ../tools/X11/ratmen {};
 
-  ratox = callPackage ../applications/networking/instant-messengers/ratox { };
+  ratox = callPackage ../applications/networking/instant-messengers/ratox {
+    libtoxcore = libtoxcore-old;
+  };
 
   ratpoison = callPackage ../applications/window-managers/ratpoison { };
 
@@ -17660,7 +17656,6 @@ with pkgs;
     nix-prefetch-git
     nix-prefetch-hg
     nix-prefetch-svn
-    nix-prefetch-zip
     nix-prefetch-scripts;
 
   nix-template-rpm = callPackage ../build-support/templaterpm { inherit (pythonPackages) python toposort; };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 095498b73dc..1fa5303c346 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -95,6 +95,8 @@ in {
     };
   };
 
+  aenum = callPackage ../development/python-modules/aenum { };
+
   agate = buildPythonPackage rec {
     name = "agate-1.2.2";
     disabled = isPy3k;
@@ -5651,6 +5653,8 @@ in {
     };
   };
 
+  leather = callPackage ../development/python-modules/leather { };
+
   libtmux = buildPythonPackage rec {
     name = "libtmux-${version}";
     version = "0.6.0";
@@ -11914,7 +11918,6 @@ in {
       downloadPage = https://github.com/PythonCharmers/python-future/releases;
       license = licenses.mit;
       maintainers = with maintainers; [ prikhi ];
-      platforms = platforms.linux;
     };
   };
 
@@ -18149,11 +18152,11 @@ in {
 
   parsel = buildPythonPackage rec {
     name = "parsel-${version}";
-    version = "1.0.3";
+    version = "1.1.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/parsel/${name}.tar.gz";
-      sha256 = "9c12c370feda864c2f541cecce9bfb3a2a682c6c59c097a852e7b040dc6b8431";
+      sha256 = "0a34d1c0bj1fzb5dk5744m2ag6v3b8glk4xp0amqxdan9ldbcd97";
     };
 
     buildInputs = with self; [ pytest pytestrunner ];
@@ -30943,13 +30946,13 @@ EOF
 
   w3lib = buildPythonPackage rec {
     name = "w3lib-${version}";
-    version = "1.14.2";
+    version = "1.17.0";
 
     buildInputs = with self ; [ six pytest ];
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/w/w3lib/${name}.tar.gz";
-      sha256 = "bd87eae62d208eef70869951abf05e96a8ee559714074a485168de4c5b190004";
+      sha256 = "0vshh300ay5wn5hwl9qcb32m71pz5s6miy0if56vm4nggy159inq";
     };
 
     meta = {
@@ -31008,35 +31011,8 @@ EOF
     };
   };
 
-  scrapy = buildPythonPackage rec {
-    name = "Scrapy-${version}";
-    version = "1.1.2";
+  scrapy = callPackage ../development/python-modules/scrapy { };
 
-    buildInputs = with self; [ pkgs.glibcLocales mock pytest botocore testfixtures pillow ];
-    propagatedBuildInputs = with self; [
-      six twisted w3lib lxml cssselect queuelib pyopenssl service-identity parsel pydispatcher
-    ];
-
-    LC_ALL="en_US.UTF-8";
-
-    checkPhase = ''
-      py.test --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py
-      # The ignored tests require mitmproxy, which depends on protobuf, but it's disabled on Python3
-    '';
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/S/Scrapy/${name}.tar.gz";
-      sha256 = "a0a8c7bccbd598d2731ec9f267b8efbd8fb99767f826f8f2924a5610707a03d4";
-    };
-
-    meta = {
-      description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages";
-      homepage = "http://scrapy.org/";
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ drewkett ];
-      platforms = platforms.linux;
-    };
-  };
   pandocfilters = buildPythonPackage rec{
     version = "1.4.1";
     pname = "pandocfilters";
@@ -31105,27 +31081,7 @@ EOF
     };
   };
 
-  Keras = buildPythonPackage rec {
-    name = "Keras-${version}";
-    version = "1.0.3";
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/k/keras/${name}.tar.gz";
-      sha256 = "0wi826bvifvy12w490ghj1g45z5xb83q2cadqh425sg56p98khaq";
-    };
-
-    propagatedBuildInputs = with self; [
-      six Theano pyyaml
-    ];
-
-    meta = {
-      description = "Deep Learning library for Theano and TensorFlow";
-      homepage = "https://keras.io";
-      license = licenses.mit;
-      maintainers = with maintainers; [ NikolaMandic ];
-    };
-  };
+  Keras = callPackage ../development/python-modules/keras { };
 
   Lasagne = buildPythonPackage rec {
     name = "Lasagne-${version}";
@@ -31248,78 +31204,11 @@ EOF
     };
   };
 
-  # tensorflow is built from a downloaded wheel, because the upstream
-  # project's build system is an arcane beast based on
-  # bazel. Untangling it and building the wheel from source is an open
-  # problem.
+  tensorflow = self.tensorflowWithoutCuda;
 
-  tensorflow = self.tensorflowNoGpuSupport;
+  tensorflowWithoutCuda = callPackage ../development/python-modules/tensorflow { };
 
-  tensorflowNoGpuSupport = buildPythonPackage rec {
-    name = "tensorflow";
-    version = "0.10.0";
-    format = "wheel";
-
-    src = pkgs.fetchurl {
-      url = if stdenv.isDarwin then
-        "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-py2-none-any.whl" else
-        "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-${version}-cp27-none-linux_x86_64.whl";
-      sha256 = if stdenv.isDarwin then
-        "1gjybh3j3rn34bzhsxsfdbqgsr4jh50qyx2wqywvcb24fkvy40j9" else
-        "0g05pa4z6kdy0giz7hjgjgwf4zzr5l8cf1zh247ymixlikn3fnpx";
-    };
-
-    propagatedBuildInputs = with self; [ numpy six protobuf3_0_0b2 pkgs.swig mock];
-
-    preFixup = ''
-      RPATH="${stdenv.lib.makeLibraryPath [ pkgs.gcc.cc.lib pkgs.zlib ]}"
-      find $out -name '*.so' -exec patchelf --set-rpath "$RPATH" {} \;
-    '';
-
-    doCheck = false;
-
-    meta = {
-      description = "TensorFlow helps the tensors flow (no gpu support)";
-      homepage = http://tensorflow.org;
-      license = licenses.asl20;
-      platforms = with platforms; linux ++ darwin;
-    };
-  };
-
-  tensorflowCuDNN = buildPythonPackage rec {
-    name = "tensorflow";
-    version = "0.11.0rc0";
-    format = "wheel";
-
-    src = pkgs.fetchurl {
-      url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-${version}-cp27-none-linux_x86_64.whl";
-      sha256 = "1r8zlz95sw7bnjzg5zdbpa9dj8wmp8cvvgyl9sv3amsscagnnfj5";
-    };
-
-    buildInputs = with self; [ pkgs.swig ];
-    propagatedBuildInputs = with self; [ numpy six protobuf3_0 pkgs.cudatoolkit75 pkgs.cudnn5_cudatoolkit75 pkgs.gcc49 self.mock ];
-
-    # Note that we need to run *after* the fixup phase because the
-    # libraries are loaded at runtime. If we run in preFixup then
-    # patchelf --shrink-rpath will remove the cuda libraries.
-    postFixup = let rpath = stdenv.lib.makeLibraryPath [
-      pkgs.gcc49.cc.lib
-      pkgs.zlib pkgs.cudatoolkit75
-      pkgs.cudnn5_cudatoolkit75
-      pkgs.linuxPackages.nvidia_x11
-    ]; in ''
-      find $out -name '*.so' -exec patchelf --set-rpath "${rpath}" {} \;
-    '';
-
-    doCheck = false;
-
-    meta = {
-      description = "TensorFlow helps the tensors flow (no gpu support)";
-      homepage = http://tensorflow.org;
-      license = licenses.asl20;
-      platforms   = platforms.linux;
-    };
-  };
+  tensorflowWithCuda = callPackage ../development/python-modules/tensorflow/cuda.nix { };
 
   tflearn = buildPythonPackage rec {
     name = "tflearn-0.2.1";
@@ -32008,18 +31897,28 @@ EOF
   };
 
   pypandoc = buildPythonPackage rec {
-    name = "pypandoc-1.2.0";
+    name = "pypandoc-1.3.3";
     src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pypandoc/${name}.zip";
-      sha256 = "1sxmgrpy0a0yy3nyxiymzqrw715gm23s01fq53q4vgn79j47jakm";
+      url = "mirror://pypi/p/pypandoc/${name}.tar.gz";
+      sha256 = "0628f2kn4gqimnhpf251fgzl723hwgyl3idy69dkzyjvi45s5zm6";
     };
+
+    # Fix tests: first requires network access, second is a bug (reported upstream)
+    preConfigure = ''
+      substituteInPlace tests.py --replace "pypandoc.convert(url, 'html')" "'GPL2 license'"
+      substituteInPlace tests.py --replace "pypandoc.convert_file(file_name, lua_file_name)" "'<h1 id=\"title\">title</h1>'"
+    '';
+
+    LC_ALL="en_US.UTF-8";
+
     propagatedBuildInputs = with self; [ self.pip ];
-    buildInputs = [ pkgs.pandoc pkgs.texlive.combined.scheme-small pkgs.haskellPackages.pandoc-citeproc ];
+    buildInputs = [ pkgs.pandoc pkgs.texlive.combined.scheme-small pkgs.haskellPackages.pandoc-citeproc pkgs.glibcLocales ];
+
     meta = with pkgs.stdenv.lib; {
       description = "Thin wrapper for pandoc";
       homepage = "https://github.com/bebraw/pypandoc";
       license = licenses.mit;
-      maintainers = with maintainers; [ bennofs ];
+      maintainers = with maintainers; [ bennofs kristoff3r ];
     };
   };