From 0059131f54c82e7714d458c0b17335c3364033a4 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Fri, 28 Apr 2017 21:30:55 -0400
Subject: [PATCH 01/84] llvm: Add the LLVM OpenMP components
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Needed to build an executable that uses OpenMP with clang. This
includes a header file and a library that clang will link into an
executable whose source makes use of ‘omp‘ pragmas.
---
 pkgs/development/compilers/llvm/4/default.nix |  2 ++
 pkgs/development/compilers/llvm/4/openmp.nix  | 25 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/compilers/llvm/4/openmp.nix

diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix
index 4be621adb5c..15918f9c1eb 100644
--- a/pkgs/development/compilers/llvm/4/default.nix
+++ b/pkgs/development/compilers/llvm/4/default.nix
@@ -24,6 +24,8 @@ let
 
     clang = wrapCC self.clang-unwrapped;
 
+    openmp = callPackage ./openmp.nix {};
+
     libcxxClang = ccWrapperFun {
       cc = self.clang-unwrapped;
       isClang = true;
diff --git a/pkgs/development/compilers/llvm/4/openmp.nix b/pkgs/development/compilers/llvm/4/openmp.nix
new file mode 100644
index 00000000000..c8ba770e241
--- /dev/null
+++ b/pkgs/development/compilers/llvm/4/openmp.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, fetch
+, cmake
+, zlib
+, llvm
+, perl
+, version
+}:
+
+stdenv.mkDerivation {
+  name = "openmp-${version}";
+
+  src = fetch "openmp" "09kf41zgv551fnv628kqhlwgqkd2bkiwii9gqi6q12djgdddhmfv";
+
+  buildInputs = [ cmake llvm perl ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Components required to build an executable OpenMP program";
+    homepage    = http://openmp.llvm.org/;
+    license     = stdenv.lib.licenses.mit;
+    platforms   = stdenv.lib.platforms.all;
+  };
+}

From 91ee3530a721b51fff72ddedea41172aab08b151 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Fri, 5 May 2017 11:23:46 +0200
Subject: [PATCH 02/84] ipfs service: Fix dataDir being ignored IPFS uses the
 environment variable IPFS_PATH to determine where to look for it's data,
 which wasn't set previously therefore ignoring the dataDir attribute

---
 .../services/network-filesystems/ipfs.nix      | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index e6e04248854..bd46147c6bc 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -3,12 +3,19 @@
 with lib;
 
 let
-  inherit (pkgs) ipfs;
+  inherit (pkgs) ipfs runCommand makeWrapper;
 
   cfg = config.services.ipfs;
 
   ipfsFlags = ''${if cfg.autoMigrate then "--migrate" else ""} ${if cfg.enableGC then "--enable-gc" else ""} ${toString cfg.extraFlags}'';
 
+  pathEnv = { IPFS_PATH = cfg.dataDir; };
+
+  # Wrapping the ipfs binary with the environment variable IPFS_PATH set to dataDir because we can't set it in the user environment
+  wrapped = runCommand "ipfs" { buildInputs = [ makeWrapper ]; } ''
+    mkdir -p "$out/bin"
+    makeWrapper "${ipfs}/bin/ipfs" "$out/bin/ipfs" --set IPFS_PATH ${cfg.dataDir}
+  '';
 in
 
 {
@@ -86,7 +93,7 @@ in
   ###### implementation
 
   config = mkIf cfg.enable {
-    environment.systemPackages = [ pkgs.ipfs ];
+    environment.systemPackages = [ wrapped ];
 
     users.extraUsers = mkIf (cfg.user == "ipfs") {
       ipfs = {
@@ -116,9 +123,10 @@ in
         install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.dataDir}
       '';
 
+      environment = pathEnv;
+
       script =  ''
         if [[ ! -d ${cfg.dataDir}/.ipfs ]]; then
-          cd ${cfg.dataDir}
           ${ipfs}/bin/ipfs init ${optionalString cfg.emptyRepo "-e"}
         fi
         ${ipfs}/bin/ipfs --local config Addresses.API ${cfg.apiAddress}
@@ -145,6 +153,8 @@ in
 
       path  = [ pkgs.ipfs ];
 
+      environment = pathEnv;
+
       serviceConfig = {
         ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags}";
         User = cfg.user;
@@ -164,6 +174,8 @@ in
 
       path  = [ pkgs.ipfs ];
 
+      environment = pathEnv;
+
       serviceConfig = {
         ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags} --offline";
         User = cfg.user;

From 295a23a2db2c6aef712864770f92547c1494e307 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sun, 7 May 2017 22:30:41 +0200
Subject: [PATCH 03/84] htslib: 1.3.2 -> 1.4

---
 .../libraries/science/biology/htslib/default.nix  | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix
index 29fb338c838..a74905b5ba1 100644
--- a/pkgs/development/libraries/science/biology/htslib/default.nix
+++ b/pkgs/development/libraries/science/biology/htslib/default.nix
@@ -1,16 +1,21 @@
-{ stdenv, fetchurl, zlib }:
+{ stdenv, fetchurl, zlib, bzip2, lzma, curl }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
+  version = "${major}.0";
   pname = "htslib";
-  version = "1.3.2";
+  major = "1.4";
 
   src = fetchurl {
-    url = "https://github.com/samtools/${pname}/releases/download/${version}/${name}.tar.bz2";
-    sha256 = "0iq3blw23s55vkr1z88p9y2dqrb2dybzhl6hz2nlk53ncihrxcdr";
+    url = "https://github.com/samtools/htslib/releases/download/${major}/htslib-${major}.tar.bz2";
+    sha256 = "0l1ki3sqfhawfn7fx9v7i2pm725jki4c5zij9j96xka5zwc8iz2w";
   };
 
-  buildInputs = [ zlib ];
+  buildInputs = [ zlib bzip2 lzma curl ];
+
+  configureFlags = "--enable-libcurl"; # optional but strongly recommended
+
+  installFlags = "prefix=$(out)";
 
   meta = with stdenv.lib; {
     description = "A C library for reading/writing high-throughput sequencing data";

From 9073e67568c66038ab8e5649b5944b6419d42b30 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sun, 7 May 2017 22:31:14 +0200
Subject: [PATCH 04/84] samtools: 1.3.1 -> 1.4

---
 pkgs/applications/science/biology/samtools/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix
index e97af1ea0ee..827c1448693 100644
--- a/pkgs/applications/science/biology/samtools/default.nix
+++ b/pkgs/applications/science/biology/samtools/default.nix
@@ -3,14 +3,15 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "samtools";
-  version = "1.3.1";
+  major = "1.4";
+  version = "${major}.0";
 
   src = fetchurl {
-    url = "https://github.com/samtools/${pname}/releases/download/${version}/${name}.tar.bz2";
-    sha256 = "0znnnxc467jbf1as2dpskrjhfh8mbll760j6w6rdkwlwbqsp8gbc";
+    url = "https://github.com/samtools/samtools/releases/download/${major}/samtools-${major}.tar.bz2";
+    sha256 = "1x73c0lxvd58ghrmaqqyp56z7bkmp28a71fk4ap82j976pw5pbls";
   };
 
-  buildInputs = [ zlib ncurses htslib ];
+  buildInputs = [ zlib ncurses ];
 
   configureFlags = [ "--with-htslib=${htslib}" ]
     ++ stdenv.lib.optional (ncurses == null) "--without-curses";

From 7fb709a5ab1046563c9d1cf5cc70411a3871098c Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sun, 7 May 2017 22:27:45 +0200
Subject: [PATCH 05/84] languagetool: 3.5 -> 3.7

---
 pkgs/tools/text/languagetool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix
index 383e9cf72c3..62d544ff408 100644
--- a/pkgs/tools/text/languagetool/default.nix
+++ b/pkgs/tools/text/languagetool/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "LanguageTool";
-  version = "3.5";
+  version = "3.7";
   name = pname + "-" + version;
   src = fetchurl {
     url = "https://www.languagetool.org/download/${name}.zip";
-    sha256 = "1axw8fqg2wlkmv45s71q5pg44sg1s06szpkjhyscy704i7d2jc34";
+    sha256 = "04i49z022k3nyyr8hnlxima9k5id8qvh2nr3dv8zgcqm5sin6xx9";
   };
   buildInputs = [ unzip jdk ];
   installPhase =

From 25a3563102e2beeae64257671581c93a2ef6e4b0 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 8 May 2017 18:03:02 +0200
Subject: [PATCH 06/84] activator: remove package from package-set

the typesafe activator is about to reach end of life at the end of this
month (2017-05) and the servers will be decommissioned at the ond of 2017.

See http://www.lightbend.com/community/core-tools/activator-and-sbt for
and the project's readme
(https://github.com/typesafehub/activator/blob/master/README.md) for further reference.
---
 pkgs/development/tools/activator/default.nix | 32 --------------------
 pkgs/top-level/all-packages.nix              |  8 ++++-
 2 files changed, 7 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/development/tools/activator/default.nix

diff --git a/pkgs/development/tools/activator/default.nix b/pkgs/development/tools/activator/default.nix
deleted file mode 100644
index 394c60e0fdd..00000000000
--- a/pkgs/development/tools/activator/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, unzip, jre }:
-
-stdenv.mkDerivation rec {
-
-  name = "${pname}-${version}";
-  pname = "activator";
-  version = "1.3.12";
-
-  src = fetchurl {
-    url = "http://downloads.typesafe.com/typesafe-${pname}/${version}/typesafe-${name}.zip";
-    sha256 = "0c7mxznfgvywnyvr8l5jh4cp67ila5cdq14p6jwrkh6lwif3ah1p";
-  };
-
-  buildInputs = [ unzip jre ];
-
-  installPhase = ''
-    mkdir -p $out/{bin,lib,libexec}
-    mv repository $out/lib
-    sed -i -e "s,declare.*activator_home.*=.*,declare -r activator_home=$out/lib/,g" bin/activator
-    mv bin/activator $out/bin
-    mv libexec/activator-launch-${version}.jar $out/libexec
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A scafollding tool for setting up reactive projects";
-    homepage = "http://typesafe.com/activator";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ edwtjo cko ];
-    platforms = with platforms; unix;
-  };
-
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b2540cbe206..9788926adca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6320,7 +6320,13 @@ with pkgs;
 
   ### DEVELOPMENT / TOOLS
 
-  activator = callPackage ../development/tools/activator { };
+  activator = throw ''
+    Typesafe Activator was removed in 2017-05-08 as the actual package reaches end of life.
+
+    See https://github.com/NixOS/nixpkgs/pull/25616
+    and http://www.lightbend.com/community/core-tools/activator-and-sbt
+    for more information.
+  '';
 
   alloy = callPackage ../development/tools/alloy { };
 

From 1ce951e79afef260cb6d2ea64119bff5e26989e8 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Tue, 9 May 2017 01:31:38 +0300
Subject: [PATCH 07/84] wineUnstable: 2.6 -> 2.7

Update staging as well
---
 pkgs/misc/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 8c04b4fc433..85ad8498063 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -32,15 +32,15 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "2.6";
+    version = "2.7";
     url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
-    sha256 = "1h5ajw50fax2pg9p4wch6824zxdd85g2gh9nkbllfxj3ixsn9zz6";
+    sha256 = "0k711vdn1h2x6ar20hpvb5b6zh21niy2n9s9mgvlag1iiq446np5";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "1j1fsq7pb7rxi7ppagrk93gmg5wk3anr9js0civxiqd3h8d4lsz2";
+    sha256 = "0ipz160mpg9di47xin9whcq986nrbadmcvpdbwgrpwlxf63x4k63";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";

From f3c19651db035a51f1872ba772df42a74ff36680 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Tue, 9 May 2017 01:32:01 +0300
Subject: [PATCH 08/84] winetricks: 20170316 -> 20170327

---
 pkgs/misc/emulators/wine/sources.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 85ad8498063..e0db6285df8 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -47,8 +47,8 @@ in rec {
   };
 
   winetricks = fetchFromGitHub rec {
-    version = "20170316";
-    sha256 = "193g3b6rfbxkxmq1y0rawrkrzb225ly71hprif3lv09gmi2bf95a";
+    version = "20170327";
+    sha256 = "1iplk8nl37k94bhhy3q3jxkif0mnpc09xhwxn2xic16nvfavrmhy";
     owner = "Winetricks";
     repo = "winetricks";
     rev = version;

From 398f6ed7d3b385cf11d95f4d83f5012300112444 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Tue, 9 May 2017 10:11:05 +0200
Subject: [PATCH 09/84] docker-edge: 17.04 to 17.05

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/applications/virtualization/docker/default.nix | 12 ++++++------
 pkgs/applications/virtualization/docker/proxy.nix   |  4 ++--
 pkgs/top-level/all-packages.nix                     |  5 +++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 6f3feddfda0..ffab4303c4a 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -157,14 +157,14 @@ rec {
     tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
   };
 
-  docker_17_04 = dockerGen rec {
-    version = "17.04.0-ce";
-    rev = "4845c56"; # git commit
-    sha256 = "04farary19ws7xzsyack0sbrxjzp5xwjh26frxbpdd0a88pxnbj7";
+  docker_17_05 = dockerGen rec {
+    version = "17.05.0-ce";
+    rev = "90d35abf7b3535c1c319c872900fbd76374e521c"; # git commit
+    sha256 = "1m4fcawjj14qws57813wjxjwgnrfxgxnnzlj61csklp0s9dhg7df";
     runcRev = "9c2d8d184e5da67c95d601382adf14862e4f2228";
     runcSha256 = "131jv8f77pbdlx88ar0zjwdsp0a5v8kydaw0w0cl3i0j3622ydjl";
-    containerdRev = "422e31ce907fd9c3833a38d7b8fdd023e5a76e73";
-    containerdSha256 = "1g0k82f1mk3vn57k130q776wp5c226d06qbiq1q148pqxxhym2r2";
+    containerdRev = "9048e5e50717ea4497b757314bad98ea3763c145";
+    containerdSha256 = "1r9xhvzzh7md08nqb0rbp5d1rdr7jylb3da954d0267i0kh2iksa";
     tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
     tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
   };
diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix
index a9f278c4d2a..52005c4a273 100644
--- a/pkgs/applications/virtualization/docker/proxy.nix
+++ b/pkgs/applications/virtualization/docker/proxy.nix
@@ -4,13 +4,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "docker-proxy-${rev}";
-  rev = "0f534354b813003a754606689722fe253101bc4e";
+  rev = "7b2b1feb1de4817d522cc372af149ff48d25028e";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "docker";
     repo = "libnetwork";
-    sha256 = "1ah7h417llcq0xzdbp497pchb9m9qvjhrwajcjb0ybrs8v889m31";
+    sha256 = "1ng577k11cyv207bp0vaz5jjfcn2igd6w95zn4izcq1nldzp5935";
   };
 
   buildInputs = [ go ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c6295ef5c5..7cafe88b6ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13405,10 +13405,11 @@ with pkgs;
 
   inherit (callPackage ../applications/virtualization/docker { })
     docker_17_03
-    docker_17_04;
+    docker_17_04
+    docker_17_05;
 
   docker = docker_17_03;
-  docker-edge = docker_17_04;
+  docker-edge = docker_17_05;
 
   docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };
 

From e3beb0710836deab2f4e366b4681e5a04c1107a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 9 May 2017 18:56:26 +0100
Subject: [PATCH 10/84] systemd-boot: sync efi filesystem after update

Since fat32 provides little recovery facilities after a crash,
it can leave the system in an unbootable state, when a crash/outage
happens shortly after an update. To decrease the likelihood of this
event sync the efi filesystem after each update.
---
 .../boot/loader/systemd-boot/systemd-boot-builder.py       | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
index 704c574b822..804b710f375 100644
--- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
+++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
@@ -2,12 +2,15 @@
 import argparse
 import shutil
 import os
+import sys
 import errno
 import subprocess
 import glob
 import tempfile
 import errno
 import warnings
+import ctypes
+libc = ctypes.CDLL("libc.so.6")
 
 def copy_if_not_exists(source, dest):
     if not os.path.exists(dest):
@@ -145,5 +148,9 @@ def main():
         if os.readlink(system_dir(gen)) == args.default_config:
             write_loader_conf(gen)
 
+    rc = libc.syncfs(os.open("@efiSysMountPoint@", os.O_RDONLY))
+    if rc != 0:
+        print("could not sync @efiSysMountPoint@: {}".format(os.strerror(rc)), file=sys.stderr)
+
 if __name__ == '__main__':
     main()

From 92bb3e8b9bcbffe37c2e1c0efe467cdd018d6f14 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Wed, 10 May 2017 09:42:44 +0900
Subject: [PATCH 11/84] i3: fix runtime dependencies

Fixes #25633.
---
 .../modules/services/x11/window-managers/i3.nix | 17 ++++++++++++++++-
 .../applications/window-managers/i3/default.nix |  9 +--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/i3.nix b/nixos/modules/services/x11/window-managers/i3.nix
index f9c75e80db4..c9b0669e7ba 100644
--- a/nixos/modules/services/x11/window-managers/i3.nix
+++ b/nixos/modules/services/x11/window-managers/i3.nix
@@ -36,6 +36,21 @@ in
         i3 package to use.
       '';
     };
+
+    extraPackages = mkOption {
+      type = with types; listOf package;
+      default = with pkgs; [ dmenu i3status i3lock ];
+      example = literalExample ''
+        with pkgs; [
+          dmenu
+          i3status
+          i3lock
+        ]
+      '';
+      description = ''
+        Extra packages to be installed system wide.
+      '';
+    };
   };
 
   config = mkIf cfg.enable {
@@ -50,7 +65,7 @@ in
         waitPID=$!
       '';
     }];
-    environment.systemPackages = [ cfg.package ];
+    environment.systemPackages = [ cfg.package ] ++ cfg.extraPackages;
   };
 
   imports = [
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index fded295b0ef..df7ba69c5c5 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms
 , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev
 , yajl, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon
-, xorgserver, xvfb_run, dmenu, i3status }:
+, xorgserver, xvfb_run }:
 
 stdenv.mkDerivation rec {
   name = "i3-${version}";
@@ -30,13 +30,6 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  postFixup = ''
-    substituteInPlace $out/etc/i3/config --replace dmenu_run ${dmenu}/bin/dmenu_run
-    substituteInPlace $out/etc/i3/config --replace "status_command i3status" "status_command ${i3status}/bin/i3status"
-    substituteInPlace $out/etc/i3/config.keycodes --replace dmenu_run ${dmenu}/bin/dmenu_run
-    substituteInPlace $out/etc/i3/config.keycodes --replace "status_command i3status" "status_command ${i3status}/bin/i3status"
-  '';
-
   # Tests have been failing (at least for some people in some cases)
   # and have been disabled until someone wants to fix them. Some
   # initial digging uncovers that the tests call out to `git`, which

From 134dd8ce53da9763920278f3331d954c914402b2 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Tue, 9 May 2017 23:57:17 +0200
Subject: [PATCH 12/84] ncmpcpp: 0.7.5 -> 0.7.7

---
 pkgs/applications/audio/ncmpcpp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix
index 8dc15195a45..0660d0b2bc3 100644
--- a/pkgs/applications/audio/ncmpcpp/default.nix
+++ b/pkgs/applications/audio/ncmpcpp/default.nix
@@ -15,11 +15,11 @@ assert taglibSupport -> (taglib != null);
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "ncmpcpp-${version}";
-  version = "0.7.5";
+  version = "0.7.7";
 
   src = fetchurl {
     url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2";
-    sha256 = "0zg084m06y7dd8ccy6aq9hx8q7qi2s5kl0br5139hrmk40q68kvy";
+    sha256 = "1vq19m36608pvw1g8nbcaqqb89wsw05v35pi45xwr20z7g4bxg5p";
   };
 
   configureFlags = [ "BOOST_LIB_SUFFIX=" ]

From 7120c66928bcfc3b411a759e178dc4b09c77e8ae Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Tue, 9 May 2017 22:26:32 +0200
Subject: [PATCH 13/84] emby: 3.2.13.0 -> 3.2.15.0

---
 pkgs/servers/emby/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index 406731424cd..c3b68477808 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "emby-${version}";
-  version = "3.2.13.0";
+  version = "3.2.15.0";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
-    sha256 = "180prfbc1lv35cqwamzzgl30c0j89nh18jr1nwjancq0s0wkiksp";
+    sha256 = "0xfjj899l7xmmiwwbfj4j9dwgrq10911nls06viz793bflmxw082";
   };
 
   buildInputs = with pkgs; [

From deb2581aa13f3ccdd7264547817e938288695e73 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Tue, 9 May 2017 15:47:49 -0300
Subject: [PATCH 14/84] phwmon: 2016-03-13 -> 2017-04-10

---
 pkgs/applications/misc/phwmon/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/phwmon/default.nix b/pkgs/applications/misc/phwmon/default.nix
index e5dd22bfbb1..0cee74522ab 100644
--- a/pkgs/applications/misc/phwmon/default.nix
+++ b/pkgs/applications/misc/phwmon/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "phwmon-${version}";
-  version = "2016-03-13";
+  version = "2017-04-10";
 
   src = fetchFromGitLab {
     owner = "o9000";
     repo = "phwmon";
-    rev = "90247ceaff915ad1040352c5cc9195e4153472d4";
-    sha256 = "1gkjfmd8rai7bl1j7jz9drmzlw72n7mczl0akv39ya4l6k8plzvv";
+    rev = "b162e53dccc4adf8f11f49408d05fd85d9c6c909";
+    sha256 = "1hqmsq66y8bqkpvszw84jyk8haxq3cjnz105hlkmp7786vfmkisq";
   };
 
   nativeBuildInputs = [ pythonPackages.wrapPython ];

From 6d924de9fbd860ee717b7bce74de32f7f2c832cf Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Tue, 9 May 2017 15:29:05 -0300
Subject: [PATCH 15/84] pmenu: 2016-05-13 -> 2017-04-10

---
 pkgs/applications/misc/pmenu/default.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/pmenu/default.nix b/pkgs/applications/misc/pmenu/default.nix
index da59f7f1886..2472b05a2e0 100644
--- a/pkgs/applications/misc/pmenu/default.nix
+++ b/pkgs/applications/misc/pmenu/default.nix
@@ -1,29 +1,25 @@
-{ stdenv, fetchFromGitLab, python2Packages, gnome2 }:
+{ stdenv, fetchFromGitLab, python2Packages, gnome3 }:
 
 stdenv.mkDerivation rec {
   name = "pmenu-${version}";
-  version = "2016-05-13";
+  version = "2017-04-10";
 
   src = fetchFromGitLab {
     owner = "o9000";
     repo = "pmenu";
-    rev = "90b722de345cff56f8ec0908a0e8a7d733c0c671";
-    sha256 = "15bkvadr7ab44mc8gkdqs3w14cm498mwf72w5rjm2rdh55357jjh";
+    rev = "87fec9ddf594f1046d03348de2bafcfa6e94cfd1";
+    sha256 = "0ynhml46bi5k52v7fw2pjpcac9dswkmlvh6gynvnyqjp4p153fl4";
   };
 
   nativeBuildInputs = [ python2Packages.wrapPython ];
 
-  buildInputs = [ python2Packages.pygtk gnome2.gnome_menus ];
+  buildInputs = [ python2Packages.pygtk gnome3.gnome-menus ];
 
   pythonPath = [ python2Packages.pygtk ];
-  
-  patchPhase = ''
-    substituteInPlace install.sh --replace "/usr/local" "$out"
-  '';
     
   installPhase = ''
     mkdir -p $out/bin $out/share/applications
-    ./install.sh
+    ./install.sh $out
   '';
 
   postFixup = ''

From 04988d9840ac05fe3b53efea6b0d96774ae002c2 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Tue, 9 May 2017 14:51:40 -0300
Subject: [PATCH 16/84] tint2: 0.14.1 -> 0.14.4

---
 pkgs/applications/misc/tint2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix
index f817303d025..bdbe5471407 100644
--- a/pkgs/applications/misc/tint2/default.nix
+++ b/pkgs/applications/misc/tint2/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "tint2-${version}";
-  version = "0.14.1";
+  version = "0.14.4";
 
   src = fetchFromGitLab {
     owner = "o9000";
     repo = "tint2";
     rev = version;
-    sha256 = "1wxz8sbv4cx3d3s5mbrzffidi3nayh1g6bd8m1ndz61jhv01ypam";
+    sha256 = "0bwz8fdh4imp1gdg8slzjq28s7mh942i09x9zl20f4frfdliyx47";
   };
 
   enableParallelBuilding = true;

From ce8662e693b5756e8457d94bb1765d853310afdb Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 9 May 2017 21:57:24 -0400
Subject: [PATCH 17/84] git: 2.12.2 -> 2.13.0

---
 .../version-management/git-and-tools/git/default.nix |  4 ++--
 .../git-and-tools/git/ssh-path.patch                 | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index e1e01c1ed28..eccd869ba56 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -11,7 +11,7 @@
 }:
 
 let
-  version = "2.12.2";
+  version = "2.13.0";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "0jlccxx7l4c76h830y8lhrxr4kqksrxqlnmj3xb8sqbfa0irw6nj";
+    sha256 = "0n0j36rapw31zb0sabap88ffncv8jg3nwc4miyim64ilyav2mgsb";
   };
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch b/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch
index 26db3d81082..5e24c19f0fe 100644
--- a/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch
+++ b/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch
@@ -2,20 +2,20 @@ diff --git a/connect.c b/connect.c
 index fd7ffe1..20cd992 100644
 --- a/connect.c
 +++ b/connect.c
-@@ -768,7 +768,7 @@ struct child_process *git_connect(int fd[2], const char *url,
- 
+@@ -768,7 +768,7 @@
+
  				ssh = getenv("GIT_SSH");
  				if (!ssh)
 -					ssh = "ssh";
 +					ssh = "@ssh@";
- 
- 				ssh_dup = xstrdup(ssh);
- 				base = basename(ssh_dup);
+				else
+					handle_ssh_variant(ssh, 0,
+								&port_option,
 diff --git a/git-gui/lib/remote_add.tcl b/git-gui/lib/remote_add.tcl
 index 50029d0..17b9594 100644
 --- a/git-gui/lib/remote_add.tcl
 +++ b/git-gui/lib/remote_add.tcl
-@@ -139,7 +139,7 @@ method _add {} {
+@@ -139,7 +139,7 @@
  		# Parse the location
  		if { [regexp {(?:git\+)?ssh://([^/]+)(/.+)} $location xx host path]
  		     || [regexp {([^:][^:]+):(.+)} $location xx host path]} {

From c6c7197c7dc5355ff587da9996330bb72afcb8f7 Mon Sep 17 00:00:00 2001
From: "Desmond O. Chang" <dochang@gmail.com>
Date: Tue, 9 May 2017 18:47:19 +0800
Subject: [PATCH 18/84] lnav: 0.8.1 -> 0.8.2

---
 pkgs/tools/misc/lnav/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix
index 23e823eb963..206fe987e62 100644
--- a/pkgs/tools/misc/lnav/default.nix
+++ b/pkgs/tools/misc/lnav/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, pcre-cpp, sqlite, ncurses,
-  readline, zlib, bzip2, autoconf, automake }:
+{ stdenv, fetchFromGitHub, pcre-cpp, sqlite, ncurses
+, readline, zlib, bzip2, autoconf, automake, curl }:
 
 stdenv.mkDerivation rec {
 
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     owner = "tstack";
     repo = "lnav";
     rev = "v${meta.version}";
-    sha256 = "0pag2rl7b6s2xfl80c629vhwsdvvlhcdy6732yvpgfv94w0zyjp9";
+    sha256 = "1jdjn64cxgbhhyg73cisrfrk7vjg1hr9nvkmfdk8gxc4g82y3xxc";
     inherit name;
   };
 
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
     pcre-cpp
     readline
     sqlite
+    curl
   ];
 
   preConfigure = ''
@@ -42,7 +43,7 @@ stdenv.mkDerivation rec {
     '';
     downloadPage = "https://github.com/tstack/lnav/releases";
     license = licenses.bsd2;
-    version = "0.8.1";
+    version = "0.8.2";
     maintainers = [ maintainers.dochang ];
   };
 

From 0a4da64cadc1d2b4166ed50559acf07e51e6d425 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 10 May 2017 06:35:58 +0000
Subject: [PATCH 19/84] ocamlPackages.octavius: init at 0.2.0

Octavius is a library to parse the ocamldoc comment syntax.
---
 .../ocaml-modules/octavius/default.nix        | 26 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/octavius/default.nix

diff --git a/pkgs/development/ocaml-modules/octavius/default.nix b/pkgs/development/ocaml-modules/octavius/default.nix
new file mode 100644
index 00000000000..f1668160df1
--- /dev/null
+++ b/pkgs/development/ocaml-modules/octavius/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, opam }:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+then throw "octavius is not available for OCaml ${ocaml.version}" else
+
+stdenv.mkDerivation {
+	name = "ocaml${ocaml.version}-octavius-0.2.0";
+	src = fetchurl {
+		url = http://github.com/ocaml-doc/octavius/releases/download/v0.2.0/octavius-0.2.0.tbz;
+		sha256 = "02milzzlr4xk5aymg2fjz27f528d5pyscqvld3q0dm41zcpkz5ml";
+	};
+
+	unpackCmd = "tar xjf $src";
+
+	buildInputs = [ ocaml findlib ocamlbuild topkg opam ];
+
+	inherit (topkg) buildPhase installPhase;
+
+	meta = {
+		description = "Ocamldoc comment syntax parser";
+		homepage = https://github.com/ocaml-doc/octavius;
+		license = stdenv.lib.licenses.isc;
+		maintainers = [ stdenv.lib.maintainers.vbgl ];
+		inherit (ocaml.meta) platforms;
+	};
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index d330de0f267..3a185bc0a10 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -395,6 +395,8 @@ let
 
     ocsigen-toolkit = callPackage ../development/ocaml-modules/ocsigen-toolkit { };
 
+    octavius = callPackage ../development/ocaml-modules/octavius { };
+
     ojquery = callPackage ../development/ocaml-modules/ojquery { };
 
     omd = callPackage ../development/ocaml-modules/omd { };

From e877cbdd6cf6a79bc5ae0fdc250f689392230bb8 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 10 May 2017 09:50:37 +0200
Subject: [PATCH 20/84] pythonPackages.django: 1.11 -> 1.11.1

This is a bugfix release. See
https://docs.djangoproject.com/en/1.11/releases/1.11.1/
---
 pkgs/development/python-modules/django/1_11.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix
index 3f7806bb34b..01d9992220f 100644
--- a/pkgs/development/python-modules/django/1_11.nix
+++ b/pkgs/development/python-modules/django/1_11.nix
@@ -4,12 +4,12 @@
 }:
 buildPythonPackage rec {
   name = "Django-${version}";
-  version = "1.11";
+  version = "1.11.1";
   disabled = pythonOlder "2.7";
 
   src = fetchurl {
     url = "http://www.djangoproject.com/m/releases/1.11/${name}.tar.gz";
-    sha256 = "0c1c2n05wv1br651hfbvnxw8ymcn4q8m56893pyv8xj2jijbiwxn";
+    sha256 = "131swdygapgrnkicvksqf904gkrfvljcrsqq8z82rvzf4bwgvkmv";
   };
 
   patches = [

From 344f1ee374de13c466f1cc486fe41bfde30f0a3e Mon Sep 17 00:00:00 2001
From: Markus Kohlhase <mail@markus-kohlhase.de>
Date: Wed, 10 May 2017 11:10:10 +0200
Subject: [PATCH 21/84] opencv: remove myself (flosse) from the maintainers
 list

---
 pkgs/development/libraries/opencv/3.x.nix     | 2 +-
 pkgs/development/libraries/opencv/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 52afa08f031..275c1cddab0 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -148,7 +148,7 @@ stdenv.mkDerivation rec {
     description = "Open Computer Vision Library with more than 500 algorithms";
     homepage = http://opencv.org/;
     license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [viric flosse mdaiter];
+    maintainers = with stdenv.lib.maintainers; [viric mdaiter];
     platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index 09220efbabc..37b33c21a30 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
     description = "Open Computer Vision Library with more than 500 algorithms";
     homepage = http://opencv.org/;
     license = licenses.bsd3;
-    maintainers = with maintainers; [ viric flosse ];
+    maintainers = with maintainers; [ viric ];
     platforms = platforms.linux ++ platforms.darwin;
   };
 }

From 0054865f7ee3b4c344e59536587a22fa68d76dd3 Mon Sep 17 00:00:00 2001
From: Patrick Callahan <pxcallahan@gmail.com>
Date: Fri, 24 Mar 2017 19:50:30 -0700
Subject: [PATCH 22/84] fish-foreign-env: git-20151223 -> git-20170324

---
 pkgs/shells/fish-foreign-env/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/fish-foreign-env/default.nix b/pkgs/shells/fish-foreign-env/default.nix
index b950e85916b..477c103c095 100644
--- a/pkgs/shells/fish-foreign-env/default.nix
+++ b/pkgs/shells/fish-foreign-env/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "fish-foreign-env-${version}";
-  version = "git-20151223";
+  version = "git-20170324";
 
   src = fetchFromGitHub {
     owner = "oh-my-fish";
     repo = "plugin-foreign-env";
-    rev = "2dfe5b73fd2101702c83d1d7b566e2b9332c5ddc";
-    sha256 = "17jxlbljp7k2azcl1miz5h5xfyazlf9z9lrddcrnm6r7c1w1zdh5";
+    rev = "baefbd690f0b52cb8746f3e64b326d82834d07c5";
+    sha256 = "0lwp6hy3kfk7xfx4xvbk1ir8zkzm7gfjbm4bf6xg1y6iw9jq9dnl";
   };
 
   buildCommand = ''

From 855ae6864899f82e32264ce5f09195f40d4ed0bd Mon Sep 17 00:00:00 2001
From: Patrick Callahan <pxcallahan@gmail.com>
Date: Mon, 3 Apr 2017 16:29:26 -0700
Subject: [PATCH 23/84] direnv: add fish shell hook for NixOS

---
 pkgs/tools/misc/direnv/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index 596df416743..346ee797637 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, go, bash }:
+{ stdenv, fetchFromGitHub, go, bash, writeText}:
 
 stdenv.mkDerivation rec {
   name = "direnv-${version}";
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     make install DESTDIR=$out
+    mkdir -p $out/share/fish/vendor_conf.d
+    echo "eval ($out/bin/direnv hook fish)" > $out/share/fish/vendor_conf.d/direnv.fish
   '';
 
   meta = with stdenv.lib; {

From 3d37af3e8b4f0a363464b77105cb2f36ad1e5408 Mon Sep 17 00:00:00 2001
From: Patrick Callahan <pxcallahan@gmail.com>
Date: Mon, 3 Apr 2017 16:30:08 -0700
Subject: [PATCH 24/84] fzf: add fish hook for NixOS

---
 pkgs/tools/misc/fzf/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 872a02ed9de..e1e998b7b56 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, ncurses, buildGoPackage, fetchFromGitHub }:
+{ stdenv, lib, ncurses, buildGoPackage, fetchFromGitHub, writeText }:
 
 buildGoPackage rec {
   name = "fzf-${version}";
@@ -16,6 +16,8 @@ buildGoPackage rec {
 
   outputs = [ "bin" "out" "man" ];
 
+  fishHook = writeText "load-fzf-keybindings.fish" "fzf_key_bindings";
+
   buildInputs = [ ncurses ];
 
   goDeps = ./deps.nix;
@@ -25,6 +27,12 @@ buildGoPackage rec {
     sed -i -e "s|expand('<sfile>:h:h').'/bin/fzf-tmux'|'$bin/bin/fzf-tmux'|" plugin/fzf.vim
   '';
 
+  preInstall = ''
+    mkdir -p $bin/share/fish/vendor_functions.d $bin/share/fish/vendor_conf.d
+    cp $src/shell/key-bindings.fish $bin/share/fish/vendor_functions.d/fzf_key_bindings.fish
+    cp ${fishHook} $bin/share/fish/vendor_conf.d/load-fzf-key-bindings.fish
+  '';
+
   postInstall = ''
     cp $src/bin/fzf-tmux $bin/bin
     mkdir -p $man/share/man

From 3f6d21bafc50d788d570a74dad957e792cea855d Mon Sep 17 00:00:00 2001
From: Patrick Callahan <pxcallahan@gmail.com>
Date: Sat, 25 Mar 2017 01:37:07 -0700
Subject: [PATCH 25/84] fish: resolve NixOS-related initialization problems

---
 nixos/modules/programs/fish.nix   | 89 ++++++++++++++++++++++++++-----
 pkgs/shells/fish/default.nix      | 89 +++++++++++++++++++++++++++----
 pkgs/shells/fish/etc_config.patch | 12 -----
 3 files changed, 157 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/shells/fish/etc_config.patch

diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix
index a99c98e166d..eb969ee1ce0 100644
--- a/nixos/modules/programs/fish.nix
+++ b/nixos/modules/programs/fish.nix
@@ -27,6 +27,30 @@ in
         '';
         type = types.bool;
       };
+      
+      vendor.config.enable = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether fish should source configuration snippets provided by other packages.
+        '';
+      };
+
+      vendor.completions.enable = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether fish should use completion files provided by other packages.
+        '';
+      };
+      
+      vendor.functions.enable = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether fish should autoload fish functions provided by other packages.
+        '';
+      };
 
       shellAliases = mkOption {
         default = config.environment.shellAliases;
@@ -79,31 +103,72 @@ in
     environment.etc."fish/foreign-env/loginShellInit".text = cfge.loginShellInit;
     environment.etc."fish/foreign-env/interactiveShellInit".text = cfge.interactiveShellInit;
 
+    environment.etc."fish/nixos-env-preinit.fish".text = ''
+      # avoid clobbering the environment if it's been set by a parent shell
+
+      # This happens before $__fish_datadir/config.fish sets fish_function_path, so it is currently
+      # unset. We set it and then completely erase it, leaving its configuration to $__fish_datadir/config.fish
+      set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $__fish_datadir/functions
+      
+      # source the NixOS environment config
+      fenv source ${config.system.build.setEnvironment}
+
+      # clear fish_function_path so that it will be correctly set when we return to $__fish_datadir/config.fish
+      set -e fish_function_path
+    '';
+
     environment.etc."fish/config.fish".text = ''
       # /etc/fish/config.fish: DO NOT EDIT -- this file has been generated automatically.
 
-      set fish_function_path $fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions
+      # if our parent shell didn't source the general config, do it
+      if not set -q __fish_nixos_general_config_sourced
+        set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
+        fenv source /etc/fish/foreign-env/shellInit > /dev/null
+        set -e fish_function_path[1]
+        
+        ${cfg.shellInit}
 
-      fenv source ${config.system.build.setEnvironment} > /dev/null ^&1
-      fenv source /etc/fish/foreign-env/shellInit > /dev/null
-
-      ${cfg.shellInit}
-
-      if status --is-login
-        fenv source /etc/fish/foreign-env/loginShellInit > /dev/null
-        ${cfg.loginShellInit}
+        # and leave a note to our children to spare them the same work
+        set -gx __fish_nixos_general_config_sourced 1
       end
 
-      if status --is-interactive
+      # if our parent shell didn't source the login config, do it
+      status --is-login; and not set -q __fish_nixos_login_config_sourced
+      and begin
+        set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
+        fenv source /etc/fish/foreign-env/loginShellInit > /dev/null
+        set -e fish_function_path[1]
+        
+        ${cfg.loginShellInit}
+
+        # and leave a note to our children to spare them the same work
+        set -gx __fish_nixos_login_config_sourced 1
+      end
+
+      # if our parent shell didn't source the interactive config, do it
+      status --is-interactive; and not set -q __fish_nixos_interactive_config_sourced
+      and begin
         ${fishAliases}
+        
+
+        set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
         fenv source /etc/fish/foreign-env/interactiveShellInit > /dev/null
+        set -e fish_function_path[1]
+        
+        ${cfg.promptInit}
         ${cfg.interactiveShellInit}
+
+        # and leave a note to our children to spare them the same work
+        set -gx __fish_nixos_interactive_config_sourced 1
       end
     '';
 
     # include programs that bring their own completions
-    environment.pathsToLink = [ "/share/fish/vendor_completions.d" ];
-
+    environment.pathsToLink = []
+      ++ optional cfg.vendor.config.enable "/share/fish/vendor_conf.d"
+      ++ optional cfg.vendor.completions.enable "/share/fish/vendor_completions.d"
+      ++ optional cfg.vendor.functions.enable "/share/fish/vendor_functions.d";
+    
     environment.systemPackages = [ pkgs.fish ];
 
     environment.shells = [
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 5bdf295cc6e..32b7694ba34 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -2,15 +2,91 @@
   nettools, kbd, bc, which, gnused, gnugrep,
   groff, man-db, glibc, libiconv, pcre2,
   gettext, ncurses, python
+
+  , writeText
+
+  , useOperatingSystemEtc ? true
+  
 }:
 
 with stdenv.lib;
 
+let
+  etcConfigAppendixText = ''
+    ############### ↓ Nix hook for sourcing /etc/fish/config.fish ↓ ###############
+    #                                                                             #
+    # Origin:
+    #     This fish package was called with the attribute
+    #     "useOperatingSystemEtc = true;".
+    #
+    # Purpose:
+    #     Fish ordinarily sources /etc/fish/config.fish as
+    #        $__fish_sysconfdir/config.fish,
+    #     and $__fish_sysconfdir is defined at compile-time, baked into the C++
+    #     component of fish. By default, it is set to "/etc/fish". When building
+    #     through Nix, $__fish_sysconfdir gets set to $out/etc/fish. Here we may
+    #     have included a custom $out/etc/config.fish in the fish package,
+    #     as specified, but according to the value of useOperatingSystemEtc, we
+    #     may want to further source the real "/etc/fish/config.fish" file.
+    #
+    #     When this option is enabled, this segment should appear the very end of
+    #     "$out/etc/config.fish". This is to emulate the behavior of fish itself
+    #     with respect to /etc/fish/config.fish and ~/.config/fish/config.fish:
+    #     source both, but source the more global configuration files earlier
+    #     than the more local ones, so that more local configurations inherit
+    #     from but override the more global locations.
+    
+    if test -f /etc/fish/config.fish
+      source /etc/fish/config.fish
+    end
+    
+    #                                                                             #
+    ############### ↑ Nix hook for sourcing /etc/fish/config.fish ↑ ###############
+  '';
+
+  fishPreInitHooks = ''
+    # source nixos environment if we're a login shell
+    builtin status --is-login
+    and test -f /etc/fish/nixos-env-preinit.fish
+    and source /etc/fish/nixos-env-preinit.fish
+
+    test -n "$NIX_PROFILES"
+    and begin
+      # We ensure that __extra_* variables are read in $__fish_datadir/config.fish
+      # with a preference for user-configured data by making sure the package-specific
+      # data comes last. Files are loaded/sourced in encounter order, duplicate
+      # basenames get skipped, so we assure this by prepending Nix profile paths
+      # (ordered in reverse of the $NIX_PROFILE variable)
+      #
+      # Note that at this point in evaluation, there is nothing whatsoever on the
+      # fish_function_path. That means we don't have most fish builtins, e.g., `eval`.
+
+
+      # additional profiles are expected in order of precedence, which means the reverse of the
+      # NIX_PROFILES variable (same as config.environment.profiles)
+      set -l __nix_profile_paths (echo $NIX_PROFILES | ${coreutils}/bin/tr ' ' '\n')[-1..1]
+
+      set __extra_completionsdir \
+        $__nix_profile_paths"/etc/fish/completions" \
+        $__nix_profile_paths"/share/fish/vendor_completions.d" \
+        $__extra_completionsdir
+      set __extra_functionsdir \
+        $__nix_profile_paths"/etc/fish/functions" \
+        $__nix_profile_paths"/share/fish/vendor_functions.d" \
+        $__extra_functionsdir
+      set __extra_confdir \
+        $__nix_profile_paths"/etc/fish/conf.d" \
+        $__nix_profile_paths"/share/fish/vendor_conf.d" \
+        $__extra_confdir
+    end
+  '';
+in
+
 stdenv.mkDerivation rec {
   name = "fish-${version}";
   version = "2.5.0";
 
-  patches = [ ./etc_config.patch ];
+  etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText;
 
   src = fetchurl {
     url = "http://fishshell.com/files/${version}/${name}.tar.gz";
@@ -69,15 +145,10 @@ stdenv.mkDerivation rec {
             "$out/share/fish/tools/create_manpage_completions.py"
     sed -i "s|command manpath|command ${man-db}/bin/manpath|"     \
             "$out/share/fish/functions/man.fish"
+  '' + optionalString useOperatingSystemEtc ''
+    tee -a $out/etc/fish/config.fish < ${(writeText "config.fish.appendix" etcConfigAppendixText)}
   '' + ''
-    tee -a $out/share/fish/config.fish << EOF
-
-    # make fish pick up completions from nix profile
-    if status --is-interactive
-      set -l profiles (echo \$NIX_PROFILES | ${coreutils}/bin/tr ' ' '\n')
-      set fish_complete_path \$profiles"/share/fish/vendor_completions.d" \$fish_complete_path
-    end
-    EOF
+    tee -a $out/share/fish/__fish_build_paths.fish < ${(writeText "__fish_build_paths_suffix.fish" fishPreInitHooks)}
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/shells/fish/etc_config.patch b/pkgs/shells/fish/etc_config.patch
deleted file mode 100644
index c0098c05812..00000000000
--- a/pkgs/shells/fish/etc_config.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/etc/config.fish b/etc/config.fish
-index 9be6f07..61c9ae2 100644
---- a/etc/config.fish
-+++ b/etc/config.fish
-@@ -12,3 +12,7 @@
- # if status --is-interactiv
- #   ...
- # end
-+
-+if test -f /etc/fish/config.fish
-+  source /etc/fish/config.fish
-+end

From e33848568d3321c4f042d8352168a8cf006646e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 10 May 2017 10:31:01 +0100
Subject: [PATCH 26/84] systemd-boot: document reasoning behind syncfs(2)

---
 .../system/boot/loader/systemd-boot/systemd-boot-builder.py   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
index 804b710f375..cb2a17f18f4 100644
--- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
+++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
@@ -148,6 +148,10 @@ def main():
         if os.readlink(system_dir(gen)) == args.default_config:
             write_loader_conf(gen)
 
+    # Since fat32 provides little recovery facilities after a crash,
+    # it can leave the system in an unbootable state, when a crash/outage
+    # happens shortly after an update. To decrease the likelihood of this
+    # event sync the efi filesystem after each update.
     rc = libc.syncfs(os.open("@efiSysMountPoint@", os.O_RDONLY))
     if rc != 0:
         print("could not sync @efiSysMountPoint@: {}".format(os.strerror(rc)), file=sys.stderr)

From 8da31b0e2eb16dd1dbac58545756b075792ac533 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Wed, 10 May 2017 10:33:16 +0200
Subject: [PATCH 27/84] fstar: 0.9.2.0 -> 0.9.4.0

---
 pkgs/development/compilers/fstar/default.nix | 21 +++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix
index 24a4135bde1..00714875ffc 100644
--- a/pkgs/development/compilers/fstar/default.nix
+++ b/pkgs/development/compilers/fstar/default.nix
@@ -1,26 +1,37 @@
-{ stdenv, fetchFromGitHub, mono, fsharp, dotnetPackages, z3, ocamlPackages, openssl, makeWrapper }:
+{ stdenv, fetchFromGitHub, mono, fsharp, dotnetPackages, z3, ocamlPackages, openssl, makeWrapper, pkgconfig, file }:
 
 stdenv.mkDerivation rec {
   name = "fstar-${version}";
-  version = "0.9.2.0";
+  version = "0.9.4.0";
 
   src = fetchFromGitHub {
     owner = "FStarLang";
     repo = "FStar";
     rev = "v${version}";
-    sha256 = "0vrxmxfaslngvbvkzpm1gfl1s34hdsprv8msasxf9sjqc3hlir3l";
+    sha256 = "130779p5plsgvz0dkcqycns3vwrvyfl138nq2xdhd3rkdsbyyvb7";
   };
 
   nativeBuildInputs = [ makeWrapper ];
 
   buildInputs = with ocamlPackages; [
-    mono fsharp z3 dotnetPackages.FsLexYacc ocaml findlib ocaml_batteries openssl
+    mono fsharp z3 dotnetPackages.FsLexYacc ocaml findlib ocaml_batteries
+    zarith camlp4 yojson pprint openssl pkgconfig file
   ];
 
   preBuild = ''
     substituteInPlace src/Makefile --replace "\$(RUNTIME) VS/.nuget/NuGet.exe" "true"
+    substituteInPlace src/VS/.nuget/NuGet.targets --replace "mono" "true"
 
-    source setenv.sh
+    # Fails with bad interpreter otherwise
+    patchShebangs src/tools
+    patchShebangs bin
+
+    export FSharpTargetsPath="$(dirname $(pkg-config FSharp.Core --variable=Libraries))/Microsoft.FSharp.Targets"
+    # remove hardcoded windows paths
+    sed -i '/<FSharpTargetsPath/d' src/*/*.fsproj
+
+    mkdir -p src/VS/packages/FsLexYacc.6.1.0
+    ln -s ${dotnetPackages.FsLexYacc}/lib/dotnet/FsLexYacc src/VS/packages/FsLexYacc.6.1.0/build
   '';
 
   makeFlags = [

From ac1599971f595e8c5bb3bb8f5ada4590eefeda9c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 10 May 2017 08:03:57 -0400
Subject: [PATCH 28/84] hackage2nix: Pull haskellSrc2nix from the final package
 set

---
 pkgs/development/haskell-modules/make-package-set.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 5192e09e2de..e599b56545d 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -101,7 +101,7 @@ self: let
       '';
   };
 
-  hackage2nix = name: version: haskellSrc2nix {
+  hackage2nix = name: version: self.haskellSrc2nix {
     name   = "${name}-${version}";
     sha256 = ''$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' "${all-cabal-hashes}/${name}/${version}/${name}.json")'';
     src    = "${all-cabal-hashes}/${name}/${version}/${name}.cabal";

From c8301a813bf715c0ddcee8aaff6b06cc2213cd9f Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Mon, 20 Feb 2017 21:30:43 +0100
Subject: [PATCH 29/84] pytestcov: 2.3.1 -> 2.4.0

---
 pkgs/top-level/python-packages.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b6f8c4ffc8c..75fe7529156 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5244,28 +5244,32 @@ in {
     '';
   };
 
-  pytestcov = buildPythonPackage (rec {
-    name = "pytest-cov-2.3.1";
+  pytestcov = buildPythonPackage rec {
+    name = "pytest-cov-2.4.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/pytest-cov/${name}.tar.gz";
-      sha256 = "fa0a212283cdf52e2eecc24dd6459bb7687cc29adb60cb84258fab73be8dda0f";
+      sha256 = "03c2qc42r4bczyw93gd7n0qi1h1jfhw7fnbhi33c3vp1hs81gm2k";
     };
 
+   buildInputs = with self; [ pytest pytest_xdist virtualenv process-tests ];
    propagatedBuildInputs = with self; [ coverage ];
-   buildInputs = with self; [ pytest covCore virtualenv process-tests helper ];
 
+   # xdist related tests fail with the following error
+   # OSError: [Errno 13] Permission denied: 'py/_code'
    doCheck = false;
    checkPhase = ''
+     # allow to find the module helper during the test run
+     export PYTHONPATH=$PYTHONPATH:$PWD/tests
      py.test tests
    '';
 
     meta = {
       description = "Plugin for coverage reporting with support for both centralised and distributed testing, including subprocesses and multiprocessing";
-      homepage = https://github.com/schlamar/pytest-cov;
+      homepage = https://github.com/pytest-dev/pytest-cov;
       license = licenses.mit;
     };
-  });
+  };
 
   pytest-expect = callPackage ../development/python-modules/pytest-expect { };
 

From e6f50214ed77aaad286731b66f17fb3f0b305e7c Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Mon, 20 Feb 2017 21:35:28 +0100
Subject: [PATCH 30/84] freezegun: 0.3.5 -> 0.3.8

---
 pkgs/top-level/python-packages.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 75fe7529156..66358bceaf1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24689,11 +24689,11 @@ in {
 
   freezegun = buildPythonPackage rec {
     name = "freezegun-${version}";
-    version = "0.3.5";
+    version = "0.3.8";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/f/freezegun/freezegun-${version}.tar.gz";
-      sha256 = "02ly89wwn0plcw8clkkzvxaw6zlpm8qyqpm9x2mfw4a0vppb4ngf";
+      sha256 = "1sf38d3ibv1jhhvr52x7dhrsiyqk1hm165dfv8w8wh0fhmgxg151";
     };
 
     propagatedBuildInputs = with self; [
@@ -24704,6 +24704,7 @@ in {
     meta = with stdenv.lib; {
       description = "FreezeGun: Let your Python tests travel through time";
       homepage = "https://github.com/spulec/freezegun";
+      license = licenses.asl20;
     };
   };
 

From 0afb6d789c8bf74825e8cdf6a5d3b9ab8bde4f2d Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Mon, 20 Feb 2017 22:13:57 +0100
Subject: [PATCH 31/84] pytest_xdist: 1.8 -> 1.14

---
 pkgs/top-level/python-packages.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 66358bceaf1..5dff6de52c3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5294,19 +5294,20 @@ in {
   };
 
   pytest_xdist = buildPythonPackage rec {
-    name = "pytest-xdist-1.8";
+    name = "pytest-xdist-1.14";
 
     src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pytest-xdist/pytest-xdist-1.8.zip";
-      sha256 = "b02135db7080c0978b7ce5d8f43a5879231441c2062a4791bc42b6f98c94fa69";
+      url = "mirror://pypi/p/pytest-xdist/${name}.zip";
+      sha256 = "08rn2l39ds60xshs4js787l84pfckksqklfq2wq9x8ig2aci2pja";
     };
 
-    buildInputs = with self; [ pytest ];
+    buildInputs = with self; [ pytest setuptools_scm ];
     propagatedBuildInputs = with self; [ execnet ];
 
     meta = {
       description = "py.test xdist plugin for distributed testing and loop-on-failing modes";
-      homepage = http://bitbucket.org/hpk42/pytest-xdist;
+      homepage = https://github.com/pytest-dev/pytest-xdist;
+      license = licenses.mit;
     };
   };
 

From 7fada5c17246e8efc8e179269e90996b6b8c0907 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Wed, 10 May 2017 15:03:08 +0200
Subject: [PATCH 32/84] vimplugin-vim-elixir: 2017-04-12 -> 2017-04-26

---
 pkgs/misc/vim-plugins/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 05080bd932f..f647a59e407 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -646,11 +646,11 @@ rec {
   };
 
   vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-elixir-2017-04-12";
+    name = "vim-elixir-2017-04-26";
     src = fetchgit {
       url = "https://github.com/elixir-lang/vim-elixir";
-      rev = "8781ff7c675d0cbfb4859f91698365c2eecf3205";
-      sha256 = "0990qbzs2cn3k07xrn4xcczl7kpapygpa0ypkwpgxamyk0lgjlr8";
+      rev = "e130adfd82f65be838a9c8d9eab1dff797527033";
+      sha256 = "1pxix3vr4ry1r2l7bqmq5hn1iqal970312qvfp40h8bnq792v9d1";
     };
     dependencies = [];
 

From c8b4b44ec35ed5cbee926a434873273f20f6707b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 10 May 2017 10:44:27 -0500
Subject: [PATCH 33/84] Revert "Merge pull request #25628 from
 mdorman/emacs-updates"

This reverts commit 80fc0a6f99da6ed20d23f5f5ba0167de9145c918, reversing
changes made to 50711091f83e0ab60ce86698b4bfad952beb4184.

The updates were not properly generated.
---
 .../editors/emacs-modes/elpa-generated.nix    |   18 +-
 .../editors/emacs-modes/melpa-generated.nix   | 1005 +++++++++--------
 .../emacs-modes/melpa-stable-generated.nix    |  311 ++---
 .../editors/emacs-modes/org-generated.nix     |   12 +-
 4 files changed, 667 insertions(+), 679 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index c69d4c2786f..ce9efbcca8c 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -54,10 +54,10 @@
       }) {};
     adaptive-wrap = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "adaptive-wrap";
-        version = "0.5.1";
+        version = "0.5";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/adaptive-wrap-0.5.1.el";
-          sha256 = "0qi7gjprcpywk2daivnlavwsx53hl5wcqvpxbwinvigg42vxh3ll";
+          url = "https://elpa.gnu.org/packages/adaptive-wrap-0.5.el";
+          sha256 = "0frgmp8vrrml4iykm60j4d6cl9rbcivy9yh24q6kd10bcyx59ypy";
         };
         packageRequires = [];
         meta = {
@@ -737,10 +737,10 @@
       }) {};
     exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild {
         pname = "exwm";
-        version = "0.14";
+        version = "0.13";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/exwm-0.14.tar";
-          sha256 = "14hjjpbasm84p54fxy73fg7g1fdwqkvisdw8dwwgzkflmd647mkx";
+          url = "https://elpa.gnu.org/packages/exwm-0.13.tar";
+          sha256 = "0n1wzy6chh024r0yaywjbf7mdsrxs6hrfycv5v0ps0drf6q3zldc";
         };
         packageRequires = [ xelb ];
         meta = {
@@ -1663,10 +1663,10 @@
       }) {};
     seq = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "seq";
-        version = "2.20";
+        version = "2.19";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/seq-2.20.tar";
-          sha256 = "0vrpx6nnyjb0gsypknzagimlhvcvi5y1rcdkpxyqr42415zr8d0n";
+          url = "https://elpa.gnu.org/packages/seq-2.19.tar";
+          sha256 = "11hb7is6a4h1lscjcfrzh576j0g3m5yjydn16s6x5bxp5gsr6zha";
         };
         packageRequires = [];
         meta = {
diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index fa8491ad218..8737d9bda1c 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -340,6 +340,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/ac-dabbrev.el?revision=9";
           sha256 = "0q0lbhdng5s5hqa342yyvg02hf2bfbwq513lj1rlaqz4ykvpd7fh";
+          name = "ac-dabbrev.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/ac-dabbrev";
@@ -800,8 +801,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "3fca941f4ca64689765648fa9e0e2e0b63b2244a";
-          sha256 = "1bg357cz60spwmpma8xdzrvh50znp3fz1w11gza9iirv4fnyg00j";
+          rev = "298ba7caa775089e2e4a95612c5f2b0eacbe4414";
+          sha256 = "14s5y1hsp9gr6llla8jpg3sk0lazs2a3sgkmg1lmbg3xr59lcwaz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -898,22 +899,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-isearch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    ace-isearch = callPackage ({ ace-jump-mode, avy, emacs, fetchFromGitHub, fetchurl, helm-swoop, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-isearch";
-        version = "20170506.12";
+        version = "20161107.1730";
         src = fetchFromGitHub {
           owner = "tam17aki";
           repo = "ace-isearch";
-          rev = "0502f95e333c8059a678745e5a112542965661d1";
-          sha256 = "1gzvhxkx7dl7wh2fkkiq9vplfhrqyxl0vzlzf617j4gggjbkpzps";
+          rev = "33b98ecdb3d5a966cbfc0ec7b104be5afca14f25";
+          sha256 = "05a5jf9lx1g5cms5p1js7qxria5dfm310m83zmvwcdr96mfbz9ii";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/344f0cf784a027cde196b7d766024fb415fa1968/recipes/ace-isearch";
           sha256 = "0n8qf08z9n8c2sp5ks29nxcfks5mil1jj6wq348apda8safk36hm";
           name = "ace-isearch";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ ace-jump-mode avy emacs helm-swoop ];
         meta = {
           homepage = "https://melpa.org/#/ace-isearch";
           license = lib.licenses.free;
@@ -1219,8 +1220,8 @@
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
           repo = "addressbook-bookmark";
-          rev = "2c2051aa4f9309931a0aa22e97e1e9ce16d9d99d";
-          sha256 = "1mic3v5rgg57zrsclvp1zq0bz34rcnp93vjv9lpbfj42ql72m36v";
+          rev = "2e905403922d9e79f75911586163c2cb5997a2cb";
+          sha256 = "1smfn2l4b9k422dyjzklbk2n075030hmypvhs82fnzgx7zcvzr3d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a497aec6e27efa627068542cae5a16c01c3c6d3c/recipes/addressbook-bookmark";
@@ -1528,12 +1529,12 @@
     alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }:
     melpaBuild {
         pname = "alert";
-        version = "20170503.1714";
+        version = "20170429.1810";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "alert";
-          rev = "affbbc5f359a7abcf50f4509b712fc7a80843f51";
-          sha256 = "04zxhxkk8dnq07m2cidn9mw05m2wyvix6vvbj1jaaawb60b1ic7q";
+          rev = "88ecd5f8ad7c4d3b17c3a068b9b50696ae0b815c";
+          sha256 = "0wnqf67ssbhm4l3ds49jm4pbj8pxcwv5g9x3xwmbrli3h1zb136r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert";
@@ -1588,22 +1589,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }:
+    all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "all-the-icons";
-        version = "20170505.13";
+        version = "20170502.756";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "all-the-icons.el";
-          rev = "e514a4d104c281dbb61313f46ede54610a01a306";
-          sha256 = "0bwasbm4fk0k67xr8pazsl170f90qiw0vpdqmsp9c0s2jbx2ld1g";
+          rev = "9c0d6ddf22f6fa0489ef55002d72b3f8f9ed929d";
+          sha256 = "0psc6rk97d60ji8xps8w4mzj4byqdfv3hh6r4n8zvd1qyscaqy07";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
           sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q";
           name = "all-the-icons";
         };
-        packageRequires = [ emacs font-lock-plus memoize ];
+        packageRequires = [ emacs font-lock-plus ];
         meta = {
           homepage = "https://melpa.org/#/all-the-icons";
           license = lib.licenses.free;
@@ -1772,6 +1773,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/anchored-transpose.el?revision=8";
           sha256 = "1hklypbp79pgaf1yklbm3qx4skm3xlml0cm1r9b9js3dbqyha651";
+          name = "anchored-transpose.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/993271c9931170c3352daa3c1c0a8bcfa6915d9a/recipes/anchored-transpose";
@@ -2356,6 +2358,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/aok.el?revision=13";
           sha256 = "10vdmxzifxx3fkpyg76ngnj79k3d2pq0f322rd8ssc66alxhkz3g";
+          name = "aok.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38eee4f0f7ad25d9b1de9011e63b82400177cdd5/recipes/aok";
@@ -2455,12 +2458,12 @@
     apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apiwrap";
-        version = "20170506.2356";
+        version = "20170302.1825";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "apiwrap.el";
-          rev = "4ae045879cb3d7ce45f0a4a8ad4520b9225ca37b";
-          sha256 = "0845qajz2jcyfjxynabdnqpgm6cm9h5sbb6wiq06q30794pvlc0n";
+          rev = "e6732de88dcbe48ae88466b5cf34fd30405540df";
+          sha256 = "1xg96pidwzxrg2r025pdc8644m8g11z9avcw3jvpmm11rvi2af7z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap";
@@ -2543,6 +2546,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/apropos-fn+var.el";
           sha256 = "0aa8d92ibbi1ix60j73nhvy16l8dkb3njn9d9z256jixmvzab7gr";
+          name = "apropos-fn+var.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd66a7c1a54ede8a279effeee5326be392058d1c/recipes/apropos-fn+var";
@@ -2582,6 +2586,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/apu.el?revision=27";
           sha256 = "15mq2b0df4hx53hqvgl3hcrbf9ww370byg90cail6rm50wamyik6";
+          name = "apu.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad04078221946c9d6b758809ec03ff88efce7322/recipes/apu";
@@ -2594,22 +2599,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    arch-packer = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    arch-packer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "arch-packer";
-        version = "20170506.1005";
+        version = "20170503.356";
         src = fetchFromGitHub {
           owner = "brotzeitmacher";
           repo = "arch-packer";
-          rev = "e195c4f30da2a756f6e14715f436ff22826b5e82";
-          sha256 = "0xxgnavpcimkb9adlbpcv96pp829x41nv744c8yl8rl8lb4f9xdl";
+          rev = "245d5cc3beea95657c7650fec72e2ad30f0c948f";
+          sha256 = "1h8cj0slxlvmmmn4hfqa3rwzxjpa6z2mwiaisn3q3r1gcf413gkl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/39f13017cde2d209a58dc45f0df25dc723398b72/recipes/arch-packer";
           sha256 = "06gmkc63ys6diiwbhdjyn17yhvs91nxdhqkydmm18553pzsmcy72";
           name = "arch-packer";
         };
-        packageRequires = [ async emacs s ];
+        packageRequires = [ emacs s ];
         meta = {
           homepage = "https://melpa.org/#/arch-packer";
           license = lib.licenses.free;
@@ -2768,6 +2773,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/ascii.el?revision=10";
           sha256 = "05fjsj5nmc05cmsi0qj914dqdwk8rll1d4dwhn0crw36p2ivql75";
+          name = "ascii.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ascii";
@@ -2825,12 +2831,12 @@
     assess = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }:
     melpaBuild {
         pname = "assess";
-        version = "20170504.657";
+        version = "20170413.409";
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "assess";
-          rev = "e5b0415126c6bd24bd220759ff04220d963a0195";
-          sha256 = "04242jhrajd9qi9dzngv33730sqhymgr0f18hf92fgb2k5649lqk";
+          rev = "87118057b3ae0e6542fa5e22050eb44d6efe8baa";
+          sha256 = "0cilb32zr38x9kfzfyr1ciag5pzbgp1dk62r7lhn8dxc2ip6f11j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f917a34506193f2674b195569dfd3c13ba62c1d/recipes/assess";
@@ -3143,6 +3149,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/auto-capitalize.el?revision=19";
           sha256 = "0xywyfpsi64g9lihm5ncmjrj06iq9s6pp9fmsgj1hdf9y0z65lg0";
+          name = "auto-capitalize.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4edbba637a27a641f53f8a51861b176cabaa286/recipes/auto-capitalize";
@@ -3518,6 +3525,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/auto-install.el?revision=82";
           sha256 = "043pb2wk7jh0jgxphdl4848rjyabna26gj0vlhpiyd8zc361pg9d";
+          name = "auto-install.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad02a591b981518abd147475195f9484e4012fc/recipes/auto-install";
@@ -3789,6 +3797,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/autofit-frame.el?revision=48";
           sha256 = "0c2b0d743w1c58iicg9r194zq2l5xxa08zyxj0nljw2dz9lhacwm";
+          name = "autofit-frame.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/autofit-frame";
@@ -4080,6 +4089,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/awk-it.el?revision=10";
           sha256 = "1r1vbi1r3rdbkyb2naciqwja7hxigjhqfxsfcinnygabsi7fw9aw";
+          name = "awk-it.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/awk-it";
@@ -4209,6 +4219,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/backup-each-save.el?revision=2";
           sha256 = "0b9vvi2m0fdv36wj8mvawl951gjmg3pypg08a8n6rzn3rwg0fwz7";
+          name = "backup-each-save.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/88fd979eb479701303e65e68c581f8f847887842/recipes/backup-each-save";
@@ -4350,12 +4361,12 @@
     base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "base16-theme";
-        version = "20170505.1010";
+        version = "20170502.31";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "89ee73d88183b4f60f973ff0a47a571a5de46d1d";
-          sha256 = "046db0np55fdnyr7bwhl2h1cqjh1ryd09fvkwn02cv2kb7knkfig";
+          rev = "cab618939ff5bd06a96d33a4965b00eb435c7be6";
+          sha256 = "1k8skaa0rxyjby4p7nsyz4whpj1afsmcp9pvg5cmyf5sz2v9ii3c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4437,6 +4448,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/batch-mode.el?revision=14";
           sha256 = "1aa611jrzw4svmxvw1ghgh53x4nry0sl7mxmp4kxiaybqqvz6a1p";
+          name = "batch-mode.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fb675b865b8fa1497cdd33764bad051b2fd4d7e/recipes/batch-mode";
@@ -4852,6 +4864,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/better-registers.el?revision=23";
           sha256 = "05dlhhvd1m9q642gqqj6klif13shbinqi6bi72fldidi1z6wcqlh";
+          name = "better-registers.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2667829dfc72e848ab939be0602cbec1105671b0/recipes/better-registers";
@@ -5290,6 +5303,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/blank-mode.el?revision=40";
           sha256 = "1wdplnmdllbydwr9gyyq4fbkxl5xjh7220vd4iajyv74pg2jkkkv";
+          name = "blank-mode.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e687f3d3945bdff0e8e36bcff1f629d8ad921fc/recipes/blank-mode";
@@ -5560,6 +5574,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/bookmark+.el";
           sha256 = "0iqvlwqilwpqlymj8iynw2miifl28h1g7z10q08rly2430fnmi37";
+          name = "bookmark+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/bookmark+";
@@ -5596,12 +5611,12 @@
     boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
     melpaBuild {
         pname = "boon";
-        version = "20170508.733";
+        version = "20170406.1153";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "boon";
-          rev = "b5326c5bd68f2dbeef87adae6657eb24f068dbc5";
-          sha256 = "1mxzsm1zkb99hpn7hav0yph3s04cbkhyj7dps49rphfp8s0ks90f";
+          rev = "c6fd2ade38842007204d780d329ccad035386650";
+          sha256 = "19zvnp4y509ym2mq7sj7s5s4vm66ifkc2cqh38sjlpp09rnfg3hy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
@@ -5831,6 +5846,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/browse-kill-ring+.el";
           sha256 = "01cnh9i09b7i97aqjh8m7s18js85wm7cs25dxlkcrhy112pjb1nq";
+          name = "browse-kill-ring+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e700f4066e67991dd67f6476c783e0a5134723db/recipes/browse-kill-ring+";
@@ -5870,6 +5886,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/bs-ext.el?revision=8";
           sha256 = "1yslzlx54n17330sf6b2pynz01y6ifnkhipz4hggn1i55bz8hvrw";
+          name = "bs-ext.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74c4861e76bb806ec4c4fd3482162bf0d95530a8/recipes/bs-ext";
@@ -6074,11 +6091,11 @@
     buffer-sets = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buffer-sets";
-        version = "20170505.829";
+        version = "20170501.1503";
         src = fetchgit {
           url = "https://git.flintfam.org/swf-projects/buffer-sets.git";
-          rev = "dd47af82f6cd5c4bab304e41518d4dc06bd6e353";
-          sha256 = "1wsx7m9wmzc6yiiyvsjmlqzazcss4vaq8qcdm3r1gybli32llraw";
+          rev = "4b6562d933b52cce76b1fea90d42f03777c3c5bc";
+          sha256 = "1mavhlaw5h848i223bhhxjrqjalda8svpkfcp8yw2da8r1f7f4z8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e12638554a13ef49ab24da08fe20ed2a53dbd11/recipes/buffer-sets";
@@ -6097,6 +6114,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/buffer-stack.el?revision=2";
           sha256 = "0d87cl7a4rcd6plbjyf26vaar7imwd18z24xdi4dz734m9zbkg6r";
+          name = "buffer-stack.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/buffer-stack";
@@ -7080,6 +7098,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/centered-cursor-mode.el?revision=30";
           sha256 = "15psyizjz8wf9wfxwwcdmg1bxf8jbv0qy40rskz7si7vxin8hhxl";
+          name = "centered-cursor-mode.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/centered-cursor-mode";
@@ -7202,7 +7221,7 @@
         version = "20170201.347";
         src = fetchsvn {
           url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "12187";
+          rev = "12178";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -7513,12 +7532,12 @@
     chinese-fonts-setup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-fonts-setup";
-        version = "20170507.245";
+        version = "20170422.1932";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-fonts-setup";
-          rev = "43f08ae41903dce980aed8b8ee1e92aee2c4806e";
-          sha256 = "074hgpsfzk0zwrnhm6j3q6hw4ygqf08fpc4zbn8f32dsvcd2nlws";
+          rev = "02c996e14c0dac64a02c47b01b64dc578aedafc0";
+          sha256 = "0vjdwq7bghq2gxm5n9jgk3l7wjvq3dpmrm5a45icx2vr0m05r0jb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c536882e613e83a4a2baf86479bfb3efb86d916a/recipes/chinese-fonts-setup";
@@ -7702,12 +7721,12 @@
     chinese-yasdcv = callPackage ({ chinese-pyim, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-yasdcv";
-        version = "20170504.321";
+        version = "20161030.1504";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-yasdcv";
-          rev = "92231de8771f2ffc9f5bb9b4ee08700fdb1a9dcb";
-          sha256 = "0viihcrnf7psqkfj2izdaah2w5bkz2cm46bgbhygzfqx8424vqh7";
+          rev = "664494d4c4562a4d83a0e73386f854829d7a52c0";
+          sha256 = "1qnhyv4b3sy596r3jz13iypi3jyr266lyphpw82ivb6dx33awk70";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b6d727c30d2ec0f885a927a16a442fe220a740d5/recipes/chinese-yasdcv";
@@ -7726,6 +7745,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/chm-view.el?revision=5";
           sha256 = "1r274pf0xrcdml4sy2nhhp3v5pr3y3s4lvk45hd3pmw1i4pw2fd8";
+          name = "chm-view.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8688cd57fca1974403c0e36d6289845059adac5c/recipes/chm-view";
@@ -7804,12 +7824,12 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "20170506.1322";
+        version = "20170430.816";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "ea233297492c6b4bacf1780e2243cd02c6d80ee7";
-          sha256 = "02iavmmrsk6mkwic3yrkprxv5w6s349jb4qpwbsqn4gn959a2630";
+          rev = "e4b9cf0cd781ff7ec2e589141b91599210648fba";
+          sha256 = "00kfl8nxqscjr1hb05qgi9gdi1jjgsb1swr9l4p3i1ijzwj8ax3x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -8080,7 +8100,7 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "302457";
+          rev = "302019";
           sha256 = "1m3h5kln4v2hcwc4ahzk356415iizcg8cmika8221qvqci4wj7bm";
         };
         recipeFile = fetchurl {
@@ -8529,12 +8549,12 @@
     clojure-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "clojure-snippets";
-        version = "20170508.42";
+        version = "20161024.16";
         src = fetchFromGitHub {
           owner = "mpenet";
           repo = "clojure-snippets";
-          rev = "1c6b37578c38d538ae017b23d4cd8697963b077e";
-          sha256 = "1pnxxzjbf0irbxapj7f4rqfv9j1x3qdgyq6pzi566c1qld3bkwn6";
+          rev = "bc9144ae5cd9e4468a9d34f1ae8a05d9933e5a39";
+          sha256 = "1xcjlid47w4xjxishal2rvfdwk7qyphy2v2bphdaysllccclw9pq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4898fc6746b30b0d0453b3b56d02479bfb0f70b9/recipes/clojure-snippets";
@@ -8722,8 +8742,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "22d0a83a4cc2188119e008ed346a10f7b0b32f8e";
-          sha256 = "1dm6q8ba7dl44hz6yrkfhj5gd77bg5w0dw4086k8w8rlzbp20xj2";
+          rev = "96820279541017402c1fe0852444aac68179ddb7";
+          sha256 = "1f3sgyhc8gywm90wpsahkfw966wvf4nmm2h4ragf71j1g4l1abc4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8784,6 +8804,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/cmds-menu.el?revision=10";
           sha256 = "0ladkkydypf08mn3j749fv46blpzyvh45kx52qdzhwxjiz7nlmfs";
+          name = "cmds-menu.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/de6366e4b3e72a5e68b960d6bf4bab2683ad6800/recipes/cmds-menu";
@@ -8992,6 +9013,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/col-highlight.el?revision=30";
           sha256 = "1xm1sbmcily1zy5xfpiphy3waq7928xpqmsrm3rcy37xbk2xj7vr";
+          name = "col-highlight.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2a16dca0068d9d4f25ad6b699ec8cb8da6ba17e5/recipes/col-highlight";
@@ -9195,12 +9217,12 @@
     color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-sanityinc-tomorrow";
-        version = "20170508.3";
+        version = "20170503.151";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "color-theme-sanityinc-tomorrow";
-          rev = "30deb0318baa7fa84444c03b8b2a9ab5e88f710a";
-          sha256 = "0x6mnry9irpx5067zqqc8fxl6k1r31fv1nvhxrxypc0i53df8jz7";
+          rev = "48eb1936c23c59f5c6dcce271bc8b80178fafd5d";
+          sha256 = "1s624fgd56bkc46qqfp0xawxl5687j267mhz5fk4n93i26z0cb61";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
@@ -9282,6 +9304,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/column-marker.el?revision=13";
           sha256 = "05bv198zhqw5hqq6cr11mhz02dpca74hhp1ycwq369m0yb2naxy9";
+          name = "column-marker.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5f629b6b44fae3191f58e007c39b75bbb880d517/recipes/column-marker";
@@ -9641,12 +9664,12 @@
     company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "company-coq";
-        version = "20170504.1519";
+        version = "20170424.639";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
           repo = "company-coq";
-          rev = "561a7e9243669c1edf406472f85a2836ebfcec4c";
-          sha256 = "1gk7in9arz4dnkyysxl0wbigf7ssnr3qr4jzjca2c731n8sc566b";
+          rev = "2480548183935f3d2c75e64a0ecd3a57303e1913";
+          sha256 = "0q6gdbflwhdbc2pa6g1rrd63d1gr9q84w4njpvk6g9djvqdvj1vp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq";
@@ -10242,12 +10265,12 @@
     company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "company-rtags";
-        version = "20170504.49";
+        version = "20170405.2311";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "3fca941f4ca64689765648fa9e0e2e0b63b2244a";
-          sha256 = "1bg357cz60spwmpma8xdzrvh50znp3fz1w11gza9iirv4fnyg00j";
+          rev = "298ba7caa775089e2e4a95612c5f2b0eacbe4414";
+          sha256 = "14s5y1hsp9gr6llla8jpg3sk0lazs2a3sgkmg1lmbg3xr59lcwaz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10263,12 +10286,12 @@
     company-shell = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-shell";
-        version = "20170507.445";
+        version = "20170501.645";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "company-shell";
-          rev = "57445b8116148875ad80f434af55781749c72960";
-          sha256 = "0kh0cwhivj3gnh2vml98rlfqfzfn8lkvz5kws9ni0r86fcdlwdc0";
+          rev = "a1cffbc8bf320fdeac6d48fe7aaecd8bfc268de7";
+          sha256 = "1hnnd5rwkcdav4v3jm3sqxqjkbsn6vr7qls3wwqvacrmbkxyf7q6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bbaa05d158f3806b9f79a2c826763166dbee56ca/recipes/company-shell";
@@ -10414,8 +10437,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "365c80fc32b061b33ae87ee351c4c3bc7a533cf8";
-          sha256 = "1xqn7jq2b7brnr8p7ln1y8k7psnljic3jy0scypka889zd1ggrbk";
+          rev = "4c3dad6229d6c2b628490c599b53cdc707531659";
+          sha256 = "1iyq7njhc1kjj9gkpy958dd4vkwzkr2b31bvv97sj2l1lhg63gwd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd";
@@ -10766,12 +10789,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20170506.1638";
+        version = "20170501.1903";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "f565f76dfb3a31becc32c807916c011cde6c4e64";
-          sha256 = "1dl39b4c7jij0gxdri2li6nkm7x73ljhbk0n1zwi6lw4xd7dix6p";
+          rev = "3a00c5a18da3547983e29be496e538a7130f85fb";
+          sha256 = "0j1d2zbjj527bs6igmnibjyfkb84icgdwkablp2jpafwpxi8jpgh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10997,12 +11020,12 @@
     cpputils-cmake = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cpputils-cmake";
-        version = "20170507.629";
+        version = "20170203.155";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "cpputils-cmake";
-          rev = "0d4b22cbf548e0d1ce4e79cc82ada3747bb5d389";
-          sha256 = "0cg5cnvcd5nz15bpwi5h6972dlr2kxbzbz23lsq35hcbg3gj22k7";
+          rev = "5bad6a1f1042e45fa6d2c20fd901100d14d455ff";
+          sha256 = "0ag0wkyf1y4q0cnv8gixrbhhaf871x3r97izb82v42i47cnwk228";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b84a159e97f7161d0705da5dd5e8c34ae5cb848/recipes/cpputils-cmake";
@@ -11232,6 +11255,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/crosshairs.el?revision=39";
           sha256 = "1wjj88zv37ak9zd12d7sy7j261x5y17wxmw5jrzk56shkpdvcbq0";
+          name = "crosshairs.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/crosshairs";
@@ -11543,8 +11567,8 @@
         src = fetchFromGitHub {
           owner = "mortberg";
           repo = "cubicaltt";
-          rev = "40797d45bce17024e8a8bc1ae8598de0397b7adf";
-          sha256 = "1mcc1ai51zw575kw0w4dam58bplj8wamf2qvnckc45cjcifci549";
+          rev = "9f649f16d473a39df10655ea30c3096d06e7d0fd";
+          sha256 = "1w6iig0k5b2n9rw74ffvscfiab5vz6n20mqw9b03c4cn8qqj1x4d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt";
@@ -11605,6 +11629,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/cursor-chg.el?revision=21";
           sha256 = "026x1mbjrf68xrv970jbf131d26rj0nmzi1x0c8r6qdr02pw2jy1";
+          name = "cursor-chg.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cursor-chg";
@@ -11644,6 +11669,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/cus-edit+.el";
           sha256 = "02mcvr8fnaflqwxzafr6i745wcw8akhjjq8ami312aibf5yjadik";
+          name = "cus-edit+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57370fc617f4f10cc67e9d3c6dc113ff0a18cace/recipes/cus-edit+";
@@ -11746,6 +11772,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/cygwin-mount.el?revision=17";
           sha256 = "09my4gj3qm9rdpk8lg6n6ki8ywj7kwzwd4hhgwascfnfi1hzwdvw";
+          name = "cygwin-mount.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f94fb69a954275ee4098c96495b8566d6ce7cbb9/recipes/cygwin-mount";
@@ -11807,8 +11834,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "26c6ecb1dcafaee77c05632f1dc8561da7f1c1f9";
-          sha256 = "1bz2aif6gkhqhzfv9j4l00bv3isfc81dvylg5rp61qnzklhkc093";
+          rev = "73f045236bacf035ab9f4fe38e23705f465fc9d6";
+          sha256 = "1pzjwbsc2ly0haw756swrcvj1n4452vyvbx2zh0m8lxjfhsgqz62";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -11884,27 +11911,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    dakrone-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "dakrone-light-theme";
-        version = "20170501.654";
-        src = fetchFromGitHub {
-          owner = "dakrone";
-          repo = "dakrone-light-theme";
-          rev = "4b3f3ba8e2ffc35e537507894620245c96ff8965";
-          sha256 = "1191iyjc5pw6jy9kqmjgr1s4n88ndjdsys7hwzc8c18glv411r69";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f3a88022a5f68d2fe01e08c2e99cfe380e3697b7/recipes/dakrone-light-theme";
-          sha256 = "1njlpvfa4ar14zn51fdmby55vjgfkpskizg5rif2f3zn6y4np2xw";
-          name = "dakrone-light-theme";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/dakrone-light-theme";
-          license = lib.licenses.free;
-        };
-      }) {};
     dakrone-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dakrone-theme";
@@ -13207,6 +13213,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/dired-details.el?revision=15";
           sha256 = "1ddrhj1kw0wl7jbs9jn067vfffsvqhz4izfw9f7ihxz34fdl2iza";
+          name = "dired-details.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dired-details";
@@ -13226,6 +13233,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/dired-details+.el";
           sha256 = "0821swa6qp2bs16r1pfamc7n62002rp8v0vimamw33cqxn2d0h6x";
+          name = "dired-details+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dired-details+";
@@ -13538,6 +13546,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/dired+.el";
           sha256 = "0anrf0cax9ah5mlxxbav7f2vvv50l7psi32rgn3z3hv4z34fmkrx";
+          name = "dired+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+";
@@ -13640,6 +13649,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/dired-sort.el?revision=1";
           sha256 = "1dpxkxxfs14sdm3hwxv0j26lq0qzx4gryw42vrcdi680aj24962z";
+          name = "dired-sort.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1e4cd8274cdec74a9867060f72ec2025ed0150d/recipes/dired-sort";
@@ -13658,6 +13668,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/dired-sort-menu.el?revision=9";
           sha256 = "1i42r7j1c8677qf79ig33bia24d2yvcj26y92migfvrlbi03w4qi";
+          name = "dired-sort-menu.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/dired-sort-menu";
@@ -13677,6 +13688,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/dired-sort-menu+.el";
           sha256 = "0f2z0nj51i27qqj0ws644k61dj9bp3hagi9phj9d41fcsqzzja4h";
+          name = "dired-sort-menu+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/dired-sort-menu+";
@@ -13902,12 +13914,12 @@
     disaster = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "disaster";
-        version = "20170507.1626";
+        version = "20130509.1055";
         src = fetchFromGitHub {
           owner = "jart";
           repo = "disaster";
-          rev = "3bab3c0db29c6d5484ab8aacbf29490e3aa2d713";
-          sha256 = "15brdrcq2i3rckdh2ml5m1fvf7asgqij9swc1p9fgp1fk2i05sfn";
+          rev = "8d8fc67af5b3d876b0056562ece0478e6e2367f0";
+          sha256 = "1srlz63pncxndh1kmb6dl5sxaanspxa444wg998dld3dkdflwavq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a4654b3646b96f967e2c75440e664a417cd0f517/recipes/disaster";
@@ -14031,6 +14043,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/disk.el?revision=9";
           sha256 = "1c0pgqvl1z2f5hprszln53pn2v2pqy110r3wx3g84v71w6378bbv";
+          name = "disk.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/edcafb4c459cf51fecc7c43a3e4dcbe377d68b46/recipes/disk";
@@ -14641,12 +14654,12 @@
     doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "20170508.512";
+        version = "20170501.2212";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-theme";
-          rev = "88240132a4a3dee4b851ea0ad31ba612c6578b22";
-          sha256 = "0k0qm9aknjq0cd16f3apwx05mmzaz2rfjjm1pxlp0qqk95cdkp4b";
+          rev = "4f43a05d051cb74d7a6e4dad5ebe87169ae4d11e";
+          sha256 = "1f04pnnvim3jpjxrlisj12c1gxbj3j2ca63hnvvvb61wrfwjilym";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes";
@@ -14665,6 +14678,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/doremi.el?revision=42";
           sha256 = "03alkj4mxajsgmghw935hm3c95a12222zq1ig6kwmfrla5kg3b7q";
+          name = "doremi.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi";
@@ -14684,6 +14698,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/doremi-cmd.el?revision=47";
           sha256 = "09iizx079y43qk3jd66n8i8ifm2s7jnc9g7831nv5f3c26rgl0w6";
+          name = "doremi-cmd.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-cmd";
@@ -14703,6 +14718,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/doremi-frm.el?revision=74";
           sha256 = "0f9vwajgdm37krz55sv5c8ijfqhy5gsxj1zyxg8zbs6l33giynxd";
+          name = "doremi-frm.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-frm";
@@ -14721,6 +14737,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/doremi-mac.el?revision=30";
           sha256 = "002jhqk26ywiyci1r91aqbq0zhbxy6rsyw3h74ck04rxjfc49rxl";
+          name = "doremi-mac.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-mac";
@@ -15012,6 +15029,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/dropdown-list.el?revision=5";
           sha256 = "1szy46sk3nvlbb3yzk1s983281kkf507xr3fkclkki3d3x31n08a";
+          name = "dropdown-list.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dropdown-list";
@@ -15071,7 +15089,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1794448";
+          rev = "1793641";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -15172,12 +15190,12 @@
     dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "dumb-jump";
-        version = "20170506.1020";
+        version = "20170501.1316";
         src = fetchFromGitHub {
           owner = "jacktasia";
           repo = "dumb-jump";
-          rev = "0c75553da94702244a6aa5ae37218a2fcf39bbf0";
-          sha256 = "1086i0qxjw14q86m72hw7r5dfim67xn0bqid6i4lhmp39dh34rnm";
+          rev = "2372300982bab406b80ecfe7209c35ae0388f603";
+          sha256 = "1r8j1fw37s4r4hidan1px8wvlnl7cssks2pqgp9l0vcyr7fwzl3g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump";
@@ -15741,6 +15759,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/echo-bell.el?revision=8";
           sha256 = "0000ya8y6v5xvl5qkrsamzwh1iikc3clhpdpdr2da6c4b9cznydh";
+          name = "echo-bell.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a81e339e9c7cf1ae5fe91ab4442164336a6fbf13/recipes/echo-bell";
@@ -16739,6 +16758,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/el-swank-fuzzy.el?revision=3";
           sha256 = "1g2jhm9m5qcj6a231n5ch6b8bqwzq3kj275nd4s89p89v1252qhn";
+          name = "el-swank-fuzzy.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2aecf6d476c7898478e6e5dcfc77d91935f07039/recipes/el-swank-fuzzy";
@@ -16841,6 +16861,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/eldoc-extension.el?revision=10";
           sha256 = "13ncpp3hrwk0h030c5nnm2zfiingilr5b876jsf2wxmylg57nbch";
+          name = "eldoc-extension.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2c59866b554def3f6cef997cc23254a560f3eb33/recipes/eldoc-extension";
@@ -18212,12 +18233,12 @@
     emms-player-mpv-jp-radios = callPackage ({ cl-lib ? null, emacs, emms, emms-player-simple-mpv, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "emms-player-mpv-jp-radios";
-        version = "20170506.1024";
+        version = "20170330.904";
         src = fetchFromGitHub {
           owner = "momomo5717";
           repo = "emms-player-mpv-jp-radios";
-          rev = "43ef07db6e724847fdcff5f66d1806b3e8d315e4";
-          sha256 = "15wfr6qs4k6anm16zing0rgawpbrnk9589vr06fc6qvkald7ib3v";
+          rev = "7c3dc98e86a178c217bec74fb1e5da7de00fded9";
+          sha256 = "0xdqi3fi26pj166z2f1fpl9ckdma9rsck324ha343r2y3snfzch0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/09ba6da5057061f055d4a3212d167f9666618d4f/recipes/emms-player-mpv-jp-radios";
@@ -18602,12 +18623,12 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20170508.3";
+        version = "20170502.2314";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "8117122e36a77f9e5616c4260680a07317aebe80";
-          sha256 = "02qmpppawziqpsyb2d2mrdyvs4mn6mvcn5smnkkanibabwgld9za";
+          rev = "4767e98d2355a3b0c7c47930c950e18939469f8e";
+          sha256 = "1k3aya3laip1fmly85r2yw1yvsw4gsqp7jscmilram6ckjrp8f97";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -19239,12 +19260,12 @@
     erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "20170504.642";
+        version = "20170428.34";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "c002dc9493a2ae9b01d49e39b9e89ef38b165973";
-          sha256 = "1d4qwyw8kapba5dn6l7m6qzgzf265arjg2kjcz618p6gg79ryxhm";
+          rev = "95e22b101b73087630fd58ae2487a91fcf004334";
+          sha256 = "1ksnlgrgkh3n62rmzrzacjq8lvfxiisz0pjadg26sxxy6mhbaagk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -20018,6 +20039,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/etags-select.el?revision=21";
           sha256 = "0gmlmxlwfsfk5axn3x5cfvqy9bx26ynpbg50mdxiljk7wzqs5dyb";
+          name = "etags-select.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5875d00419666388acbcb8a4f392308e7576da0b/recipes/etags-select";
@@ -20036,6 +20058,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/etags-table.el?revision=4";
           sha256 = "0apm8as606bbkpa7i1hkwcbajzsmsyxn6cwfk9dkkll5bh4vglqf";
+          name = "etags-table.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3efc1791df5658ca5bba4907f2a22c2cabfd3c8/recipes/etags-table";
@@ -20051,12 +20074,12 @@
     ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ethan-wspace";
-        version = "20170507.1330";
+        version = "20160317.920";
         src = fetchFromGitHub {
           owner = "glasserc";
           repo = "ethan-wspace";
-          rev = "e055ee6730c0b03525d32e67511ef6c51e4c29e4";
-          sha256 = "0ik3y60xd3ap1pg5dr5ab6bq4qh8gblpgz1iiprmv7acr3ckzc41";
+          rev = "b8eae49ed3e7f646c16234970af5663e3090e720";
+          sha256 = "1xqc4lqzirpmr21w766g8vmcvvsq8b3hv9i7r27i5x1g0j4jabja";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9454f3a58e3416fa60d8411b0db19c408935408f/recipes/ethan-wspace";
@@ -20198,12 +20221,12 @@
     evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
-        version = "20170507.2332";
+        version = "20170419.37";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "ae7fca1835fb7056fc164ee4d906e4eb43c88f97";
-          sha256 = "0xccbb89fw2gnw5qcb02nfxvdwg832gwrc27zknadi7xa9n6iaxm";
+          rev = "f0684c1f6644a8c4e0e5fce50a1a04796555eaf1";
+          sha256 = "0q5zg7d3ml9v1hylmngvb6k45f2lakrq7xcn9z1qkbk1b003j6rz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil";
@@ -21479,12 +21502,12 @@
     exec-path-from-shell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "exec-path-from-shell";
-        version = "20170508.4";
+        version = "20170304.1309";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "exec-path-from-shell";
-          rev = "5e355fbc50913d1ffe48bf86df0bcecd8b369ffb";
-          sha256 = "1flkhbyxa7mi97vj4w6c2anzq7qz51sac6yqk308blfvd9z3pf95";
+          rev = "15d07666fb356008e612278f181292e2d2afc5fc";
+          sha256 = "0kjsxwadxysx3ccgdwd12k4vj43qjs3zd6z4f8sycbk732x0893d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/exec-path-from-shell";
@@ -21646,12 +21669,12 @@
     exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
     melpaBuild {
         pname = "exwm-x";
-        version = "20170507.622";
+        version = "20170502.1644";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "exwm-x";
-          rev = "bb894c44ffca623f37461617bdc53b2092ca2b4c";
-          sha256 = "1xkandsng3r79vp2i3kqcva35qs4wvcafjxzsnawrvgbskh8kd1g";
+          rev = "f008acd531597566c68b3dc00067d9be5f3d8cd1";
+          sha256 = "1f2pyvafhm22y7w9x7fdh60yggpm6nsid5hm6r8vl9xd5gq9pl97";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
@@ -21817,6 +21840,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/face-remap+.el";
           sha256 = "1p42wjzl2brbqv3vh3g1rcgh5m9a7bix5q80pg7r6515as8kykad";
+          name = "face-remap+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/face-remap+";
@@ -21835,6 +21859,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/facemenu+.el";
           sha256 = "0nnaqmdsf6ksk6663924bpw3mrldybj6jjkgj0525nhpfjx7x4yq";
+          name = "facemenu+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/facemenu+";
@@ -21853,6 +21878,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/faces+.el";
           sha256 = "0a80027a78zad0nxlkmv69b2zzbz4b29rsn4ivgb313r4c24igzx";
+          name = "faces+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/faces+";
@@ -22268,6 +22294,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/files+.el";
           sha256 = "1ch7k4gpfcb5k6z656rprdcvxp75wsfjhw5l6x8f05qbmm0cbimv";
+          name = "files+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/files+";
@@ -22286,6 +22313,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/filesets+.el";
           sha256 = "0i9nc9zhpj208as9pynnh6xvr0qk53y7bpg2gw4gak9xr9xywbpg";
+          name = "filesets+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/filesets+";
@@ -22388,6 +22416,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/find-dired+.el";
           sha256 = "0zfqkw9vghbzvdh3iyqkkdq777bb1yhfgqk7p28dxz861z13cmfs";
+          name = "find-dired+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/find-dired+";
@@ -22403,12 +22432,12 @@
     find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "find-file-in-project";
-        version = "20170507.150";
+        version = "20170402.2100";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "1f5b7ef7c6e00ab6fb818c4dc9131c1fe7806704";
-          sha256 = "0pcq992pd5vsajsrcpkp5jl3sgxk1p2p0i8in050rs25i3l3lgj0";
+          rev = "a81f7d7020d5bdfcc835911d4def6f09301a1f55";
+          sha256 = "167anv3qyslfzyrcq4qnzhdx8zhbj1r0lmrvnp1spsalvcbph9ih";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -22490,6 +22519,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/finder+.el";
           sha256 = "0h1jsgb7vivmbay35s9bx8dpl7l88zdh1f6ymdm16b0alpiv4p14";
+          name = "finder+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/finder+";
@@ -22697,6 +22727,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/fit-frame.el?revision=63";
           sha256 = "1wm2jc7h5zhv695wf21l3n9gjn31ddgd0vybx8brj1nbvavifs0x";
+          name = "fit-frame.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e13c77f822db3c9eaeb3fd5fa95cc2dbe5133f2c/recipes/fit-frame";
@@ -23015,6 +23046,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/fliptext.el?revision=4";
           sha256 = "1viigj04kla20dk46xm913jzqrmx05rpjrpghnc0ylbqppqdwzpw";
+          name = "fliptext.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/093046dfb39148d56681e9c8be8cccff23dd19cb/recipes/fliptext";
@@ -23156,12 +23188,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20170507.113";
+        version = "20170502.2305";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "4cb411b27b244af81ef40318f7854abdccc38291";
-          sha256 = "0kfq9h81nh9j8kv7fcx1qh7yx2kmq7l6lkdivabwh6jbnvdyw23n";
+          rev = "6ab177c96ead5ffd8ae492080d09db63505852b0";
+          sha256 = "0296ab8k1daq8d79pwvrq4m2jl4vja7vpzjvjcalbpnn2hvqmm26";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -24122,12 +24154,12 @@
     flycheck-pos-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }:
     melpaBuild {
         pname = "flycheck-pos-tip";
-        version = "20170504.1504";
+        version = "20161112.912";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-pos-tip";
-          rev = "7b94c0c1e3185a4350dc39885add3927037ebad8";
-          sha256 = "0m56rflfdzddfsr1xlgzfl7i259786hxsnwa0m729140c6v8f5wh";
+          rev = "88b5a6d7ce0f313cbd22d554ea248aab95357d33";
+          sha256 = "0jfgq346b4nh9wry3mnf4sfbv3l78kgadklvbv0nxykvlpx9c1rv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/698843f75e17b9e6160487c0153f9d6b4af288f6/recipes/flycheck-pos-tip";
@@ -24210,8 +24242,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "3fca941f4ca64689765648fa9e0e2e0b63b2244a";
-          sha256 = "1bg357cz60spwmpma8xdzrvh50znp3fz1w11gza9iirv4fnyg00j";
+          rev = "298ba7caa775089e2e4a95612c5f2b0eacbe4414";
+          sha256 = "14s5y1hsp9gr6llla8jpg3sk0lazs2a3sgkmg1lmbg3xr59lcwaz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -24399,8 +24431,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "365c80fc32b061b33ae87ee351c4c3bc7a533cf8";
-          sha256 = "1xqn7jq2b7brnr8p7ln1y8k7psnljic3jy0scypka889zd1ggrbk";
+          rev = "4c3dad6229d6c2b628490c599b53cdc707531659";
+          sha256 = "1iyq7njhc1kjj9gkpy958dd4vkwzkr2b31bvv97sj2l1lhg63gwd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd";
@@ -25406,6 +25438,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/font-lock+.el";
           sha256 = "0iajkgh0n3pbrwwxx9rmrrwz8dw2m7jsp4mggnhq7zsb20ighs30";
+          name = "font-lock+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/font-lock+";
@@ -25736,10 +25769,11 @@
     frame-cmds = callPackage ({ fetchurl, frame-fns, lib, melpaBuild }:
     melpaBuild {
         pname = "frame-cmds";
-        version = "20170506.945";
+        version = "20170222.1758";
         src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/frame-cmds.el?revision=93";
-          sha256 = "1ax9hcrhhwll4m4xi0dvsv4q498cngq5xzib6n2ka706fmnjj0rj";
+          url = "https://www.emacswiki.org/emacs/download/frame-cmds.el?revision=92";
+          sha256 = "1r2hyl7f1rgw20mh8nj0lzf491p5pl4pfprv0yj0jls5jaqds4xc";
+          name = "frame-cmds.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/frame-cmds";
@@ -25758,6 +25792,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/frame-fns.el?revision=31";
           sha256 = "1yl51wnmlmbirrhcf07rnqix62q7ijymwfbahwjsz2s18g2zyj6n";
+          name = "frame-fns.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/frame-fns";
@@ -25818,6 +25853,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/framemove.el?revision=4";
           sha256 = "03ll68d0j0b55rfxymzcirdigkmxcy8556d0i67ghdzmcqfwily7";
+          name = "framemove.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f075338369dbf0694205c1b2c35dc16821f6dc92/recipes/framemove";
@@ -25988,12 +26024,12 @@
     fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }:
     melpaBuild {
         pname = "fstar-mode";
-        version = "20170504.2114";
+        version = "20170501.229";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "f1ea9d9eb1c529f6a3859779d24718b4fc8ee7a1";
-          sha256 = "0v4r3nczn8whi0drsqrm2zdq4lj0l95hbplqbr80z420y6xchasc";
+          rev = "fa8cd790b6c017b720d623879b13ff17d32352cb";
+          sha256 = "0393wrzd89dg880j7pzs7c6c0zsc839b4abwp9v4xjmp9v3nd1fy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fstar-mode";
@@ -26020,8 +26056,8 @@
         version = "20170107.626";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "c1d6477c22df9cd0604c2b06aca919a53674bb78";
-          sha256 = "1lz1bwgjvjijs3v2v6qyivzbz9jl7zx55n65hlsq0nq6limjd8bh";
+          rev = "e44104c8d2b832ab8e023c9b5b31417b77e649d1";
+          sha256 = "1q0x4s1lqkxjnzppphvcvnpl6d61mp5gz5zx4pa0xms8zk6yln9f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -26142,12 +26178,12 @@
     futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "futhark-mode";
-        version = "20170506.1334";
+        version = "20170502.1145";
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "593a03f9163a6a1d3264d102e2e2862e917403e1";
-          sha256 = "0hg8gn66dd7k60mqc9raqwl37q8h3qh4s74njsfrl0pa5i7a6pka";
+          rev = "d9b774da4dcccad4e7d3868a46591cef7c65436c";
+          sha256 = "13g0gji1ql0ydyj6b0rqa2fja90pl43iwhn8xvh2h0b5kl2c5m24";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26187,6 +26223,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/fuzzy-format.el?revision=6";
           sha256 = "1iv0x1cb12kknnxyq2gca7m3c3rg9s4cxz397sazkh1csrn0b2i7";
+          name = "fuzzy-format.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/154cb0a10c81ce4907029f0eddc51108961c65ae/recipes/fuzzy-format";
@@ -26205,6 +26242,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/fuzzy-match.el?revision=23";
           sha256 = "1wxl900wikkzykzp95v84kcyw3m1d16hklhyqqhsmg58ph4i6r94";
+          name = "fuzzy-match.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fuzzy-match";
@@ -26953,12 +26991,12 @@
     git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "git-commit";
-        version = "20170507.1603";
+        version = "20170314.1414";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "df2cec53353cb74110c1c494b936e022015fd20a";
-          sha256 = "0vxnbh19pqkf7bdgc697bln6v8wa5a2wgmm4xhr1cj4s0bwnwinw";
+          rev = "595f7c6fac10a91f9edb68615f23d05b3d829f3c";
+          sha256 = "1a5lglslbhsnwjaspxbxj2kqnz53k7vkfb91xj73pqxk9lr8m2y5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -27121,12 +27159,12 @@
     git-link = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-link";
-        version = "20170504.1834";
+        version = "20170301.1618";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "git-link";
-          rev = "88bb1cddbcbaa52c674288173fc0806fc6d4a904";
-          sha256 = "0yj0rldpvyfz939ld9pfgpamlzrc70wchvq094js6il78514lr49";
+          rev = "8d43732a753bcea8a7777b03755c17a0f45094d2";
+          sha256 = "1p439cwrxkcf36qfv93j8h2xyynynysr9ch9w662mhm7k7fgwc65";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link";
@@ -27817,6 +27855,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/gnus-spotlight.el?revision=2";
           sha256 = "1r6bck1hsvk39ccri1h128jj8zd0fh9bsrlp8ijb0v9f6x3cysw4";
+          name = "gnus-spotlight.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/004d48a59063163bfe5fbc5311330893d1b3b41c/recipes/gnus-spotlight";
@@ -28466,8 +28505,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "styleguide";
-          rev = "d012c726248bee61bdc20bd68a40fd67778739ae";
-          sha256 = "1r8v6grvd81i3dih0nzc77hjh778bqpwwcn9zycvwgj9j64fwzj9";
+          rev = "15f2836d9fea3835d541d4d327ccf053d4052822";
+          sha256 = "1yrd7v75pcpb658m53ysgai3ak5nvrm7bf7hzhga3rgm20hhsc16";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style";
@@ -28654,6 +28693,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/goto-chg.el?revision=9";
           sha256 = "078d6p4br5vips7b9x4v6cy0wxf6m5ij9gpqd4g33bryn22gnpij";
+          name = "goto-chg.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/529897b0c076d9031e7ecd13c945d2104ce8c735/recipes/goto-chg";
@@ -28715,8 +28755,8 @@
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "2030458d4e8ea0bbf0363ea109d0f3004686e802";
-          sha256 = "0j41v8422f3p23pxzkb83ni9v4k315jizc2x4d54wi5haa7b4gw5";
+          rev = "b8b228cfbad7f0a69ed90393ca9aee085d3c6ef1";
+          sha256 = "03p33p1hvr34ams41hy68p5rmmbsizcm606myfaj7f07dfl9l0gv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -28841,8 +28881,8 @@
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "9849318762a1f495b3c8913e47256450c1854489";
-          sha256 = "0f0h6syghw0kfqzway1f8hc0agrbdsdc68931bjprm7fm43dhrzw";
+          rev = "1f233c26c90b4f77b18a05decfc16a57a71e4d82";
+          sha256 = "1s41wxkl3lqasm5f2qmq3iv19cchfwfn6r1l4asm9j25mcbkk2z9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -28879,12 +28919,12 @@
     grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "grandshell-theme";
-        version = "20170507.104";
+        version = "20170118.2148";
         src = fetchFromGitHub {
           owner = "steckerhalter";
           repo = "grandshell-theme";
-          rev = "2f7e607cde9dd38ad4a95f3f3ad6cd85eba09f7b";
-          sha256 = "0mc29g3hz7fb2a91rr24z2fnlqdwnq1q3lh14qyd7i9zpy5965dl";
+          rev = "c0884bfe0b2df8d6279cabd5ef6c521aaf7c0897";
+          sha256 = "1cn3i4kp5pjiaq96svam3xn1s33lpysnzk77vq25wp65vz9jpbcg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme";
@@ -29017,11 +29057,11 @@
     grass-mode = callPackage ({ cl-lib ? null, dash, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "grass-mode";
-        version = "20170503.800";
+        version = "20170303.854";
         src = fetchhg {
           url = "https://bitbucket.com/tws/grass-mode.el";
-          rev = "1ae8eae88117";
-          sha256 = "1sl3d5759fjm98pb50ykz2c05czb2298ipccwj2qz2hdzq63hfv8";
+          rev = "5383fff2996b";
+          sha256 = "1igbdrs14dmaa5mbhq3jnrkq16nndingflpnwxi921dag613c3jz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grass-mode";
@@ -29124,6 +29164,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/grep+.el";
           sha256 = "0jx2r21x8ndikvn8zvdnmwg8al56yi9gb0fcmplc3lnq4my6xcjr";
+          name = "grep+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/grep+";
@@ -29218,22 +29259,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "groovy-mode";
-        version = "20170503.148";
+        version = "20170323.817";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "9849318762a1f495b3c8913e47256450c1854489";
-          sha256 = "0f0h6syghw0kfqzway1f8hc0agrbdsdc68931bjprm7fm43dhrzw";
+          rev = "1f233c26c90b4f77b18a05decfc16a57a71e4d82";
+          sha256 = "1s41wxkl3lqasm5f2qmq3iv19cchfwfn6r1l4asm9j25mcbkk2z9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
           sha256 = "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal";
           name = "groovy-mode";
         };
-        packageRequires = [ s ];
+        packageRequires = [];
         meta = {
           homepage = "https://melpa.org/#/groovy-mode";
           license = lib.licenses.free;
@@ -29431,12 +29472,12 @@
     guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "guix";
-        version = "20170508.1218";
+        version = "20170420.351";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "41a9d7ba0acfd19e4c669aed12684e852bf886ca";
-          sha256 = "1vkhzb9mzcrm7yc6vccd0937j19hg1m3jbswlb7qjl3gi3dc57hr";
+          rev = "9343c749ebf4ffbd3961042ba0e5d0b00f688df0";
+          sha256 = "12r2rlyh8xmx0yn17yb4qpb0c50rr553p39nfj17m0ishrgb8vbn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -29939,8 +29980,8 @@
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "90a352f0d23ffc46a626d512c1c76d70994e77a8";
-          sha256 = "177r3vv9vh24bxara2wq4nrfi6yvfchi9syy8j5ridj2l3vzsxiz";
+          rev = "8165d8a809c21e220a257806ebe88180cbc8694a";
+          sha256 = "1vx6liapkkfsd678nmlsx3r641v2vxxbqk82cw6cqanzp3i5p7y4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -30167,6 +30208,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/header2.el?revision=69";
           sha256 = "0cv74cfihr13jrgyqbj4x0na659djfyrhflxni6jdbgbysi4zf6k";
+          name = "header2.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/header2";
@@ -30203,12 +30245,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170506.840";
+        version = "20170503.19";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "8ae3d884bd5d890e446bc5c687ff833dcc8c6e2d";
-          sha256 = "0sji3jkrf8lkmb6s2755qqam3mzc15j4v0v915jz4vqb53v1kn1g";
+          rev = "ba171080eb4baa1f913c28caeefbb17589fcdacc";
+          sha256 = "1zfz4dx7kfviqc9kg1079f8lwqns999y3iw5rmmqw97q7rxwy50s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -30392,12 +30434,12 @@
     helm-bbdb = callPackage ({ bbdb, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-bbdb";
-        version = "20170505.2338";
+        version = "20161122.522";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-bbdb";
-          rev = "c0e6b83911598fe334c51b12f51ff1a8252ed11d";
-          sha256 = "084m23w4088njk2c8z6yxi2851dakdq71jhpazlzms85i2dlwg21";
+          rev = "20513422102fea4c08a0433d728a7783bb4968c8";
+          sha256 = "0ns537fimv774n1bq0r8k4qwdpapbw96linqyhx9mxp23zkhlg80";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7025c319fcabc64576c0c6554d0d572cef697693/recipes/helm-bbdb";
@@ -30791,12 +30833,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170507.531";
+        version = "20170503.19";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "8ae3d884bd5d890e446bc5c687ff833dcc8c6e2d";
-          sha256 = "0sji3jkrf8lkmb6s2755qqam3mzc15j4v0v915jz4vqb53v1kn1g";
+          rev = "ba171080eb4baa1f913c28caeefbb17589fcdacc";
+          sha256 = "1zfz4dx7kfviqc9kg1079f8lwqns999y3iw5rmmqw97q7rxwy50s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -31043,12 +31085,12 @@
     helm-emms = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-emms";
-        version = "20170508.541";
+        version = "20151001.1328";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-emms";
-          rev = "69efa199f5e5ad0b84aaaf1b6a77a5879fa989a1";
-          sha256 = "0jkn0ffx8qb2wba5ik1yddk9s3jg19g5sqaj9v0zajjnq1q9l1my";
+          rev = "ed3da37e86ea5dabc15da708335b1e439ae0777d";
+          sha256 = "0330s07b41nw9q32xhjdl7yw83p8ikj6b2qkir3y0jyx16gk10dl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/db836b671705607f6cd9bce8229884b1f29b4a76/recipes/helm-emms";
@@ -32579,8 +32621,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "3fca941f4ca64689765648fa9e0e2e0b63b2244a";
-          sha256 = "1bg357cz60spwmpma8xdzrvh50znp3fz1w11gza9iirv4fnyg00j";
+          rev = "298ba7caa775089e2e4a95612c5f2b0eacbe4414";
+          sha256 = "14s5y1hsp9gr6llla8jpg3sk0lazs2a3sgkmg1lmbg3xr59lcwaz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -33082,6 +33124,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/help-fns+.el";
           sha256 = "0n7sdzvplcb0zivpjq9x75kaid59yxr7sl85w7z99irx3kgpy9y4";
+          name = "help-fns+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help-fns+";
@@ -33100,6 +33143,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/help-mode+.el";
           sha256 = "00yx1rhp7akap63c3nqh766zkjvfarmvm0xvza40i167wc7xmydg";
+          name = "help-mode+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help-mode+";
@@ -33118,6 +33162,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/help+.el";
           sha256 = "0zypqsj940cmb8szbk5acv47kaj3czg6yplx1lg5dynhvab3p29f";
+          name = "help+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help+";
@@ -33220,6 +33265,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/hexrgb.el?revision=75";
           sha256 = "1aj1fsc3wr8174xs45j2wc2mm6f8v6zs40xn0r4qisdw0plmsbsy";
+          name = "hexrgb.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hexrgb";
@@ -33322,6 +33368,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/hide-comnt.el?revision=25";
           sha256 = "1shkq45vm60nh2kkvf284nck8jwxh7f7m4c5d53k66mxn214h53m";
+          name = "hide-comnt.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hide-comnt";
@@ -33361,6 +33408,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/hide-region.el?revision=6";
           sha256 = "1zxrygpf47bzj6p808r3qhj3dfr3m8brp1xgxs33c7f88rinfval";
+          name = "hide-region.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5fc294a4d0cfa74530c98d81149fd0501ea7efe/recipes/hide-region";
@@ -33400,6 +33448,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/hideshowvis.el?revision=10";
           sha256 = "02a6v2m54r5nfbi54h1502aqh7gnz827pfi1sq266qyzj3p6yz12";
+          name = "hideshowvis.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/881fd07512c417c0b98021af2a2c26eac4268a5f/recipes/hideshowvis";
@@ -33419,8 +33468,8 @@
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "hierarchy";
-          rev = "ff87883b93fff0158d3dad8b36177a14ca9f4a2c";
-          sha256 = "19bnc9ivskxpz8nmmkdviq0vlyh3njpakmcd64c1hmar2w19fzi2";
+          rev = "81b6c5d03d289a1168fd794cb9cc0bc50a3581e0";
+          sha256 = "05s32d5j6vr6gyk6qq0ns2fh6j4pqwg6rj617m63f0adqbxnngnv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy";
@@ -33439,6 +33488,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/highlight.el?revision=145";
           sha256 = "05dsa2sfciajwagm1gzl3v2r199nl1yjnb6l0v8ria3f9d72yj5j";
+          name = "highlight.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/603e9fc90e6e6cf7fe903cb3c38155c1a4f45278/recipes/highlight";
@@ -33478,6 +33528,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/highlight-chars.el?revision=18";
           sha256 = "00rna5bs0ilgsdi5168djjpb3hg89yq20pp17sx5r3jcksm2fm4f";
+          name = "highlight-chars.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/highlight-chars";
@@ -33496,6 +33547,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/highlight-cl.el?revision=3";
           sha256 = "0r3kzs2fsi3kl5gqmsv75dc7lgfl4imrrqhg09ij6kq1ri8gjxjw";
+          name = "highlight-cl.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc85d7fd8e4d7381850f4a379140c64506f86e8/recipes/highlight-cl";
@@ -33536,6 +33588,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/highlight-current-line.el?revision=4";
           sha256 = "1aki7a7nnj9n7vh19k4fr0v7cqbwkrpc6b3f3yv95vcqj8a4y34c";
+          name = "highlight-current-line.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e2768ed5917ec2e2339412d8fbd146ca5a8a5042/recipes/highlight-current-line";
@@ -33593,12 +33646,12 @@
     highlight-indent-guides = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "highlight-indent-guides";
-        version = "20170508.1133";
+        version = "20170420.1557";
         src = fetchFromGitHub {
           owner = "DarthFennec";
           repo = "highlight-indent-guides";
-          rev = "9614941bce44e16d0681ad1f3f87ca072582a325";
-          sha256 = "1lw9pmykwswi0rg1y80v7ng29fdhymr4wn6k2p3q3yk78d9hi3m0";
+          rev = "8298186c3b4da68d000b06c317f0572c09ba391c";
+          sha256 = "0czv1mg30rn069zddzjfy1i6kjkrrps96sp45bjbjkc66c6mvpw9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8acca65a5c134d4405900a43b422c4f4e18b586/recipes/highlight-indent-guides";
@@ -33805,6 +33858,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/highlight-tail.el?revision=5";
           sha256 = "1bbiyqddqkrp3c7xsg1m4143611bhg1kkakrwscqjb4cfmx29qqg";
+          name = "highlight-tail.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d033ff8cceb7e6d1e5a9f0ec7b706eb28bfe30f3/recipes/highlight-tail";
@@ -33887,8 +33941,8 @@
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "hindent";
-          rev = "d79f4f48fcdbec0e248616e811d0e2b68adc3867";
-          sha256 = "0r5vpjnac09qhpv46afa73c8dlvy27s75bkbqpqm80ilsxqfc1yj";
+          rev = "b14e690af82e48fee6b3fd596bc96d4c1c31ea04";
+          sha256 = "1ypmvr57x3q1kp85yadl5wfphdhd40aqmd6aklcn3hi3ddnsxb7j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -33971,8 +34025,8 @@
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "historian.el";
-          rev = "d5e4283d2fc06445d2cd14d9d2e86ca41b9f718d";
-          sha256 = "0am0xjvk77bvppgx90knxicq3nw1ia68gplyqw9lqw62qj4028ip";
+          rev = "0838ed60febaf618cf242377d92aa9b5c4e42fae";
+          sha256 = "1zzngs5xqqib2yj19snwndyc27s8lfm6nfsya9zvz4bafizgdn6k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f16dacf64c52767c0c8aef653ac5d1a7a3bd0883/recipes/historian";
@@ -34096,6 +34150,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/hl-defined.el?revision=9";
           sha256 = "0sj1ypfawb1pxblm11zbfyy96f2mbpnmif972yqfrxzf5h20ra1y";
+          name = "hl-defined.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/hl-defined";
@@ -34135,6 +34190,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/hl-line+.el";
           sha256 = "1dhrfbmh98y18xgsp42rx1qqcs296mpqqzzp3nr9rcqv4gvpllgp";
+          name = "hl-line+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hl-line+";
@@ -34195,6 +34251,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/hl-spotlight.el?revision=15";
           sha256 = "02x7p6hy1mkhbish55mzsdp6a1pnsdcfl4qi9cq48syg6cfm8fw3";
+          name = "hl-spotlight.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/adb008d2da35dbd3fca63555f04dd8a0009380c6/recipes/hl-spotlight";
@@ -34273,12 +34330,12 @@
     hlinum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hlinum";
-        version = "20170507.2227";
+        version = "20160521.2112";
         src = fetchFromGitHub {
           owner = "tom-tan";
           repo = "hlinum-mode";
-          rev = "2b4a08db4ff361ac8eeee1ed94eca7e26c614595";
-          sha256 = "0j2ras605i2zsna02lp8k4mkyhln65cggmgkhgr9imcxfzwpjzqk";
+          rev = "bc92bb8344af61929ffb0cb4df9d6b30d7df80d1";
+          sha256 = "1yfq55gzg6p17qbd9xf0g9cza5bzkvl47rkjq19mf6kjxk0ihkh7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/41bca7b89a7ce52d4c9381b9a4046b7103996c4f/recipes/hlinum";
@@ -35049,6 +35106,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/icicles.el?revision=1087";
           sha256 = "00zsdahszs919zvklxgpm5kqhm2139cdr4acchgp9ppnyljs94jp";
+          name = "icicles.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/icicles";
@@ -35067,6 +35125,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/icomplete+.el";
           sha256 = "00wy0jqk6jdfh9izdpqq4y6x2x8q1m38sy6nb4ygfg3055lbhkam";
+          name = "icomplete+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fade28733f33e52a8622479de201f451c9a31c11/recipes/icomplete+";
@@ -35778,6 +35837,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/igrep.el?revision=10";
           sha256 = "0qiv69v7ig38iizif7zg8aljdmpa1jk8bsfa0iyhqqqrkvsmhc29";
+          name = "igrep.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/83c05578974289527082bb67338c35e70bbff8f2/recipes/igrep";
@@ -35962,6 +36022,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/imenu+.el";
           sha256 = "0dga9a61ckvd8w4nnz9z8z0iakaxminwn0lgmf8vfj2nwkd0m6hb";
+          name = "imenu+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/imenu+";
@@ -36081,12 +36142,12 @@
     impatient-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, simple-httpd }:
     melpaBuild {
         pname = "impatient-mode";
-        version = "20170505.1921";
+        version = "20150501.247";
         src = fetchFromGitHub {
           owner = "netguy204";
           repo = "imp.el";
-          rev = "11600a8441a1c0339252b0c19f151ccac3ee96c7";
-          sha256 = "1k251pidqgjn380xbs2h3j02r76lq1gcqkslwfpvq2g3l3ksqkkd";
+          rev = "eba1efce3dd20b5f5017ab64bae0cfb3b181c2b0";
+          sha256 = "0vr4i3ayp1n8zg3v9rfv81qnr0vrdbkzphwd5kyadjgy4sbfjykj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb1fbd03f17d2069a461260ad5e2ad4e5441919b/recipes/impatient-mode";
@@ -36144,12 +36205,12 @@
     importmagic = callPackage ({ emacs, epc, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "importmagic";
-        version = "20170504.1725";
+        version = "20170101.1603";
         src = fetchFromGitHub {
           owner = "anachronic";
           repo = "importmagic.el";
-          rev = "135e049d763ceb4cabd0bab068c4c71452459065";
-          sha256 = "1fzd3m0zwgyh3qmkhzcvgsgbnjv8nzy30brsbsa081djj5d2dagq";
+          rev = "c75afbb93b024307c4cf67e6dd44cda80bbea697";
+          sha256 = "1xz99g9j8gfd6qrdsmrf98mq61168divw8lrwl3zylfw04x20b4b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic";
@@ -36228,12 +36289,12 @@
     indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
     melpaBuild {
         pname = "indium";
-        version = "20170504.117";
+        version = "20170502.942";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "Indium";
-          rev = "adf385b7ca8edb781bb601ed8625ab0dce3db3a5";
-          sha256 = "03rqbqrw4jn8q7rha66ax9y7npyq3kv5r9ifvd5b8wii7fqkxsa5";
+          rev = "a26190da110220efc7a63db485bee8ddbf1c6a94";
+          sha256 = "1d3i8f7kdlsvc4ryw9khfxwqba9dwq81xjdm4cn6k7s6r95x7cgm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
@@ -36270,12 +36331,12 @@
     inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-clojure";
-        version = "20170507.233";
+        version = "20170501.1042";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "inf-clojure";
-          rev = "e14dbba5a4ebc80d4d855b174dc1a1aede1af73f";
-          sha256 = "1armgm80chab9mr9r2mfl0i2rc003ic51z9idcxlxgy4y0lzh625";
+          rev = "c797a5aea3d2126b19c48ed99aefe3ebddd5f304";
+          sha256 = "1m8bkh8mwl1zbvpgllrghpqr5m86lkwxn3jl3i0qd60arwy51iiy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -36420,6 +36481,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/info+.el";
           sha256 = "0xpgry9bzjwmdj0j0pcsr2a37gp8yqbcpl06linv0hjxcwca9nsz";
+          name = "info+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e77aadd8195928eed022f1e00c088151e68aa280/recipes/info+";
@@ -36791,12 +36853,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20170506.1859";
+        version = "20170410.1625";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "2db59100d2eff6bd9e34a0067c36fbab0d0ec72c";
-          sha256 = "0q0h7fikp4v8m55ci3xfmqhzh5z1rpygc4idcpnvlzgc61a7kzgi";
+          rev = "e546ea086d72b5bf8556727e2983930621c3cb3c";
+          sha256 = "1qv7l5ri3nysrpmnzfssw8wvdvz0f6bmymnz1agr66fplazid4pn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -37046,6 +37108,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/irfc.el?revision=45";
           sha256 = "197ybqwbj8qjh2p9pkf5mvqnrkpcgmv8c5s2gvl6msyrabk0mnca";
+          name = "irfc.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0b4f2dc79231b165bd3b03a728e2b872ed6c50c1/recipes/irfc";
@@ -37061,12 +37124,12 @@
     irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "irony";
-        version = "20170503.1447";
+        version = "20170502.1506";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "irony-mode";
-          rev = "823854936e8d228ab7350d0f1cf4801ed000f142";
-          sha256 = "125qwy3zpxhckqmlbxd5s2ni7910xpkv8qgdrmcafk7ld2ipjvz9";
+          rev = "349d007d55e06094a2223c14bcbc0025904e77b1";
+          sha256 = "1p6ssl3d0knjc7nnbj57ksac2yj1k4zaagh5lbsh87cc9dwkvhd0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -37127,6 +37190,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/isearch+.el";
           sha256 = "0zdc45nmswipfi8vrsbfipzd1vg9y0pcggvi5mfpwf7c3qn4sgh2";
+          name = "isearch+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/isearch+";
@@ -37145,6 +37209,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/isearch-prop.el?revision=79";
           sha256 = "0q18i76gq2pfnkqlbxlx2hndpy9mhbag302dvr8irk1kjwgngz5r";
+          name = "isearch-prop.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/isearch-prop";
@@ -37353,8 +37418,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "f565f76dfb3a31becc32c807916c011cde6c4e64";
-          sha256 = "1dl39b4c7jij0gxdri2li6nkm7x73ljhbk0n1zwi6lw4xd7dix6p";
+          rev = "3a00c5a18da3547983e29be496e538a7130f85fb";
+          sha256 = "0j1d2zbjj527bs6igmnibjyfkb84icgdwkablp2jpafwpxi8jpgh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -37437,8 +37502,8 @@
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "historian.el";
-          rev = "d5e4283d2fc06445d2cd14d9d2e86ca41b9f718d";
-          sha256 = "0am0xjvk77bvppgx90knxicq3nw1ia68gplyqw9lqw62qj4028ip";
+          rev = "0838ed60febaf618cf242377d92aa9b5c4e42fae";
+          sha256 = "1zzngs5xqqib2yj19snwndyc27s8lfm6nfsya9zvz4bafizgdn6k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fb79cbc9af6cd443b9de97817d24bcc9050d5940/recipes/ivy-historian";
@@ -37458,8 +37523,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "f565f76dfb3a31becc32c807916c011cde6c4e64";
-          sha256 = "1dl39b4c7jij0gxdri2li6nkm7x73ljhbk0n1zwi6lw4xd7dix6p";
+          rev = "3a00c5a18da3547983e29be496e538a7130f85fb";
+          sha256 = "0j1d2zbjj527bs6igmnibjyfkb84icgdwkablp2jpafwpxi8jpgh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -37542,8 +37607,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "3fca941f4ca64689765648fa9e0e2e0b63b2244a";
-          sha256 = "1bg357cz60spwmpma8xdzrvh50znp3fz1w11gza9iirv4fnyg00j";
+          rev = "298ba7caa775089e2e4a95612c5f2b0eacbe4414";
+          sha256 = "14s5y1hsp9gr6llla8jpg3sk0lazs2a3sgkmg1lmbg3xr59lcwaz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -38103,12 +38168,12 @@
     jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }:
     melpaBuild {
         pname = "jdee";
-        version = "20170506.1514";
+        version = "20170428.1341";
         src = fetchFromGitHub {
           owner = "jdee-emacs";
           repo = "jdee";
-          rev = "5b0bcf6db09d6f6d4ec68c1f3d748d91f189b5ea";
-          sha256 = "1vq4x1kvwbynb7kb6mq03939dqg3jjj6jkhkl8jjc6lk3rz7fj29";
+          rev = "9505591c3d5ff120d3e1c7736bc8869a281880c8";
+          sha256 = "0lbcvhi9swgx3by9qfw3d861qxj8spiaiygbxwh4p0lqmbz6wfad";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
@@ -38295,6 +38360,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/jira.el?revision=11";
           sha256 = "18b6hdqk59gnqh4ibq8lj59kbsg5gbyfb7vfcvpgmxjikpl3cgkz";
+          name = "jira.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/jira";
@@ -38604,12 +38670,12 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20170503.1846";
+        version = "20170429.455";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "ca7df5bf9d0a76b77edfb6d6fe11e83965aa2cb3";
-          sha256 = "14s4i150ri7x6360dr6n4gmyzfvwjrb4xck20wmfgyszys2h8ypd";
+          rev = "659f683dbae890d9483bfc603c5599280987f1c2";
+          sha256 = "14xwpbasc7jws2gr0d53wvn4rl9bd2b9mgrmwr5jv0rx3ijvgag5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -39167,12 +39233,12 @@
     kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kaolin-theme";
-        version = "20170508.1051";
+        version = "20170502.424";
         src = fetchFromGitHub {
           owner = "0rdy";
           repo = "kaolin-theme";
-          rev = "0391104a17c3c33cb62fff2fd91a63489d3c6c66";
-          sha256 = "1snc1480wlz1b26xrywf0w7d1ajljbhwan8g811py9qr1hrgm63g";
+          rev = "085470e1570c42a78bbb1ee289fa687f807a157c";
+          sha256 = "1p21842mrr1g226k0qaqlwgzb0mkr3j27aihfjjdsshw9g93q3af";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
@@ -39675,8 +39741,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "b36ddd52e3f231c30212a8242be3f31663713dda";
-          sha256 = "1n83ch4qfghkr4sfj29km4ps16nx4y9n3g25gz1s37d8wdmhbsjf";
+          rev = "9352dc350980630c5c2bc69e1b245f279164f41b";
+          sha256 = "0q09a5ln2bhfnksb9a5ycfmp5lbnqrr46i5p4n5fd53jzwj7dccp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -39692,12 +39758,12 @@
     kiwix = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kiwix";
-        version = "20170507.1129";
+        version = "20170116.503";
         src = fetchFromGitHub {
           owner = "stardiviner";
           repo = "kiwix.el";
-          rev = "6e4381294183fecffb18118679d7ebd5f6794454";
-          sha256 = "1m3hbprdq3inrr3jvwn1wyknb11zvrkkydf730d5vgpqcyy09pvi";
+          rev = "edea2234a7a5267c1888dbe2271e9100bdc3f5a8";
+          sha256 = "0b9bwcgxm2gachh2g5cn4fih2n5mzqzvl591ahq0rylgajxmxvhp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kiwix";
@@ -39944,12 +40010,12 @@
     kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "kubernetes";
-        version = "20170508.337";
+        version = "20170502.2331";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "kubernetes-el";
-          rev = "52223c7c09f709fb4897283fbc3bf7561e86f5d2";
-          sha256 = "1h5sryzb945pk46zlalsssc63nwjvnx9qhdz5ssfm1jr96ci3m2y";
+          rev = "977a0d1cb2c79c39588f3e356b4ca1ed0bb199b0";
+          sha256 = "0s3krnbd1b9v7qyrdspdnlp1n9jxzlh23681kgxzp2pi40llnq2w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes";
@@ -39965,12 +40031,12 @@
     kubernetes-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, kubernetes, lib, melpaBuild }:
     melpaBuild {
         pname = "kubernetes-evil";
-        version = "20170505.251";
+        version = "20170502.1416";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "kubernetes-el";
-          rev = "52223c7c09f709fb4897283fbc3bf7561e86f5d2";
-          sha256 = "1h5sryzb945pk46zlalsssc63nwjvnx9qhdz5ssfm1jr96ci3m2y";
+          rev = "977a0d1cb2c79c39588f3e356b4ca1ed0bb199b0";
+          sha256 = "0s3krnbd1b9v7qyrdspdnlp1n9jxzlh23681kgxzp2pi40llnq2w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes-evil";
@@ -40073,6 +40139,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/lacarte.el?revision=41";
           sha256 = "0m3swrvxz0cy01pd4kag626fxqp4l2zzwpgr26yp5wpsfxl9avv8";
+          name = "lacarte.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/lacarte";
@@ -40633,12 +40700,12 @@
     leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "leuven-theme";
-        version = "20170508.1319";
+        version = "20170309.1340";
         src = fetchFromGitHub {
           owner = "fniessen";
           repo = "emacs-leuven-theme";
-          rev = "185e19f49ad05e9d813c10d24381f3e35b8c719e";
-          sha256 = "1vxfw5nqvbv12wp0015fg5cm8z1zirya4sbr1xbakc758fq5q8j3";
+          rev = "4b11c7d4ea4dbde316844d3c73be9bafe12ac911";
+          sha256 = "0saaakcs32i0bal2v6zcw1r27jzbs3hlhcsvr0k9dkhyi2kv2nwn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme";
@@ -40720,6 +40787,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/lib-requires.el?revision=53";
           sha256 = "04lrkdjrhsgg7vgvw1mkr9a5m9xlyvjvnj2aj6w453bgmnp1mbvv";
+          name = "lib-requires.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/lib-requires";
@@ -40998,6 +41066,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/lispxmp.el?revision=17";
           sha256 = "120wgxvckrgryfg2lvyx60rkcayii0g4ny2cdk3aiwsrpqcyhlyr";
+          name = "lispxmp.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6fc8f86533402e4be8bac87ad66bc8d51c8d40f8/recipes/lispxmp";
@@ -41013,12 +41082,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20170508.839";
+        version = "20170430.402";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "f25f008107cea3ed6422e3ac5d521e38ddc7982e";
-          sha256 = "1kx1hhwf1a7ml25l26k6j3r4awvshs6ph78nh4x0hhlr3451n1hi";
+          rev = "2853551c60880282bcf76554eb39e008d0d9b712";
+          sha256 = "0zdm17z9xbs0488i8a31dn55ypmr6zgj7b88frjh93jpns218xrs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -41122,6 +41191,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/list-processes+.el";
           sha256 = "1bssvyjgk1h1wiaxxdi2m5gjy6a790a9rwvi0r22hin7iskg300a";
+          name = "list-processes+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d508d50d89c914c53211197afc758fc0e1154081/recipes/list-processes+";
@@ -41434,8 +41504,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "a641bd93fbf83cdf0deb8c0cbcc36ff980b5a0f5";
-          sha256 = "1zqshm9ymchlqbrabpn2zlafis1rbbqjaq3wgb66wvxn69lasn1q";
+          rev = "ea59a2471779a76cb73cd4d83bec3a022ff91e21";
+          sha256 = "1wg7qacrygj3ji5rhdd7jlkf4lyk150jw1xzrj4aqjkiwwydna0l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -41849,12 +41919,12 @@
     lsp-java = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
     melpaBuild {
         pname = "lsp-java";
-        version = "20170506.213";
+        version = "20170421.325";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-java";
-          rev = "fc30a0606e48049f14d750e3478d1765921424f7";
-          sha256 = "09vbj8v77samb4r4dl6ib566z4s1angrh2kgymcc5pi23cxhchkm";
+          rev = "a5aeccc2c8b37af13d48616aa3e96d4b1a7d20d3";
+          sha256 = "1vzvx38n57jfzarwl3hw188smn8dwjzz1x4rpsp3x6yza685s7cf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-java";
@@ -41870,12 +41940,12 @@
     lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "lsp-mode";
-        version = "20170507.2349";
+        version = "20170501.606";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-mode";
-          rev = "ff7dc8403a3dde4a1468c0d9c6258437f2fe584e";
-          sha256 = "0p1hnq1fbjdgscc32chsvrafpa7b036kbq0s3sykgps83nwzcvdv";
+          rev = "c668464205d81b50d8297e78b75f12beef6fc654";
+          sha256 = "1q4f1xiznj5m7yrcf319lxf5kqyqdxi6d2hwj47l19gimjch8v64";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode";
@@ -42104,6 +42174,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/macros+.el";
           sha256 = "0x9fycqw234s1i0ndy7v0d7vn654id245pi0kwphbqgnga7w3l6p";
+          name = "macros+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/macros+";
@@ -42224,12 +42295,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170508.936";
+        version = "20170425.638";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "df2cec53353cb74110c1c494b936e022015fd20a";
-          sha256 = "0vxnbh19pqkf7bdgc697bln6v8wa5a2wgmm4xhr1cj4s0bwnwinw";
+          rev = "595f7c6fac10a91f9edb68615f23d05b3d829f3c";
+          sha256 = "1a5lglslbhsnwjaspxbxj2kqnz53k7vkfb91xj73pqxk9lr8m2y5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -42420,12 +42491,12 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "20170508.936";
+        version = "20170420.544";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "df2cec53353cb74110c1c494b936e022015fd20a";
-          sha256 = "0vxnbh19pqkf7bdgc697bln6v8wa5a2wgmm4xhr1cj4s0bwnwinw";
+          rev = "595f7c6fac10a91f9edb68615f23d05b3d829f3c";
+          sha256 = "1a5lglslbhsnwjaspxbxj2kqnz53k7vkfb91xj73pqxk9lr8m2y5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -42882,12 +42953,12 @@
     mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
     melpaBuild {
         pname = "mandoku";
-        version = "20170508.27";
+        version = "20170325.1917";
         src = fetchFromGitHub {
           owner = "mandoku";
           repo = "mandoku";
-          rev = "0e733fdaea77150539455656c2e6af08d19611b0";
-          sha256 = "0sfyxdb3pnsdygk832w7mpxps1gwqaa0fqk2qrzqgl61yjlfvnd6";
+          rev = "ab6cccaccea2d0d26fc461942b4ae3ea65bd8f39";
+          sha256 = "0k4dcm4gkjy82nhcg00wgk2hipzbzvrwn8qyvjjn5r6h1jcpmfb3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -43267,12 +43338,12 @@
     mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mastodon";
-        version = "20170505.1201";
+        version = "20170429.952";
         src = fetchFromGitHub {
           owner = "jdenen";
           repo = "mastodon.el";
-          rev = "4d0bd43c0ede0159c0f0130a5565ea5a6511997a";
-          sha256 = "0l0n9l7j4inwyd4z8yvf9bi3cmq6ba5dm90lwzqx8hykwdh8ghi7";
+          rev = "ac10d7a647aa77aa933076a523a48ec0a283dd15";
+          sha256 = "1cy11qlms6499vjphnx5yxpknvs1a90q67ibrijhwyhsy9gi798l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon";
@@ -43437,6 +43508,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/mb-depth+.el";
           sha256 = "1vqminlfc146c8wr00ck7drs5kf92fvdmhyqyh2hj6394cvqs7w9";
+          name = "mb-depth+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/mb-depth+";
@@ -43770,6 +43842,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/menu-bar+.el";
           sha256 = "1rxy2yp1f5fi5wk8lg04dmg943131rvvqiif1k18n0gajg1x8hxx";
+          name = "menu-bar+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/menu-bar+";
@@ -43830,6 +43903,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/message-x.el?revision=9";
           sha256 = "05ic97plsysh4nqwdrsl5m9f24m11w24bahj8bxzfdawfima2bkf";
+          name = "message-x.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7bf124ec30fa5551b31c0e0d39be234f19e2e81/recipes/message-x";
@@ -43971,12 +44045,12 @@
     mew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mew";
-        version = "20170508.22";
+        version = "20161224.1535";
         src = fetchFromGitHub {
           owner = "kazu-yamamoto";
           repo = "Mew";
-          rev = "7ea2baefff668263bf011c72879c2aa88125f2de";
-          sha256 = "1i7i600hj76ggn1jwlj8r60kf157pxj88a4wwp1lasz91wp6msdv";
+          rev = "8138c83339071884a2d6c5365a088ba8da4a0fc0";
+          sha256 = "0yvqarinibrg7f362gg1i3r2wgjmzzv0j71zcrp9id30gfwbs6z3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew";
@@ -44372,6 +44446,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/minor-mode-hack.el?revision=10";
           sha256 = "0vwvvhzqiad82qvfwygb2arq1mdvh1lj6q2as0a92fg1vc95qcb0";
+          name = "minor-mode-hack.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/df182bfd8272f3ded761c90826c8cfe6bfd1a48b/recipes/minor-mode-hack";
@@ -44432,6 +44507,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/misc-cmds.el?revision=103";
           sha256 = "1w58z2j95sycgkakgb9anlc3q73v77whspi9a4j1kf6lmcbpyms8";
+          name = "misc-cmds.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/misc-cmds";
@@ -44450,6 +44526,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/misc-fns.el?revision=50";
           sha256 = "0jjmd33z36dikkbskskgbdv8pflkwaxn4ifajq4ghrdprdhm6gbm";
+          name = "misc-fns.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c2cbbe5a718ec961982a7f65de8f6ec1c9513696/recipes/misc-fns";
@@ -44761,6 +44838,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/modeline-char.el?revision=8";
           sha256 = "1c6ij1c0d6r9chzwqcpgdjq1rb2h0m09fpck9rc9rg5jy7fgdc0d";
+          name = "modeline-char.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/modeline-char";
@@ -44779,6 +44857,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/modeline-posn.el?revision=43";
           sha256 = "1cpab6k0p65nmw78y5v4lbpxw6pczkzk46zmkc76pi55yjpw6pbm";
+          name = "modeline-posn.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c62008950ea27b5a47363810f57063c1915b7c39/recipes/modeline-posn";
@@ -45004,12 +45083,12 @@
     monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "monroe";
-        version = "20170507.653";
+        version = "20170220.540";
         src = fetchFromGitHub {
           owner = "sanel";
           repo = "monroe";
-          rev = "9f5e0a226a40f0e9775ab351d33dfe9b841f7a25";
-          sha256 = "145m0lh9jypg26qdnpqj6480gk2g5g1qjzj7gz6fpgdj6940sip5";
+          rev = "6190d9935109e116944296be2faa46773e545d91";
+          sha256 = "1lp0xbsgiajbx27fnsx61krcbj6p0frar4wh5dq6i98af46vwly6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe";
@@ -45154,6 +45233,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/mouse+.el";
           sha256 = "1f49b10i1iqh0q2s2fa309dc617dzavah7fw0k1rpjk84kb001bd";
+          name = "mouse+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01cbe9b5bb88f8c02fab67a269ac53c8aa4d8326/recipes/mouse+";
@@ -45193,6 +45273,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/mouse3.el?revision=39";
           sha256 = "0rnpfz0d4spxkyssgf3j5kfajm54i1vism2q0giikd0savrh0a1c";
+          name = "mouse3.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/mouse3";
@@ -45481,12 +45562,12 @@
     mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mtg-deck-mode";
-        version = "20170506.1701";
+        version = "20170419.1926";
         src = fetchFromGitHub {
           owner = "mattiasb";
           repo = "mtg-deck-mode";
-          rev = "55d493b2e4ad0d931659d1785bcdacc6f16bed07";
-          sha256 = "1fp9q094glk4m2l6hf51ryj1qi4g3q7134hf6qjf707xv2vjcihm";
+          rev = "029f814d3261b02f650ff361f52d9d80611bbfbc";
+          sha256 = "05k0ssxmjp7lpj803lrcbyqxmxf1vnxa2j3wvpvlqrixjc63mjr9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode";
@@ -45610,6 +45691,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/multi-eshell.el?revision=9";
           sha256 = "1w1jwfznpl214a1xx46zlgqbx9c5yjzpyqqrkn3xqjgnj485yhkl";
+          name = "multi-eshell.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a9069a6eb1e57bccb06d26577cac70765de8e52f/recipes/multi-eshell";
@@ -45900,6 +45982,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/muttrc-mode.el?revision=7";
           sha256 = "1xihp3zdqs9054j3bfrd9wnahsvvxjk1ags1iy50ncv5850ppjis";
+          name = "muttrc-mode.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d3fd45af3345742cff7be99ad8210d7f8fd2a2f/recipes/muttrc-mode";
@@ -46149,6 +46232,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/naked.el?revision=23";
           sha256 = "1k3j6dyp8p47q43i4ba53krl06yx32rkjnh2f5x1zqk6nxnb1wf8";
+          name = "naked.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/naked";
@@ -46397,6 +46481,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/narrow-indirect.el?revision=13";
           sha256 = "1sdyya2gmmd2h39kmijf514y3vln6ax5xdfsrkx1hcalw4l418gh";
+          name = "narrow-indirect.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38e5dd845c99acaae719562595059154a08a5f00/recipes/narrow-indirect";
@@ -46685,12 +46770,12 @@
     neotree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "neotree";
-        version = "20170507.1711";
+        version = "20170227.1731";
         src = fetchFromGitHub {
           owner = "jaypei";
           repo = "emacs-neotree";
-          rev = "5e1271655170f4cdc6849258e383c548a4e6e3d0";
-          sha256 = "0hx72fq10772bbyqrj7mhhp02k26cccjxdadiqm1ykainhfmn1x0";
+          rev = "4d1e221cd052c5b471fa2a18658e4e3a480785c7";
+          sha256 = "1wiljbs302b1x754307ci9vzwndkkcfryn89idrlhimjbibw6i30";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree";
@@ -46811,12 +46896,12 @@
     ng2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "ng2-mode";
-        version = "20170504.2007";
+        version = "20160910.820";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
           repo = "ng2-mode";
-          rev = "adbfe16a47cf26edeb1b508cbedae5307b4efbf6";
-          sha256 = "0ll850wpr4dyh25mq41afwbz17mqz82i53hfn970n9vw2icf36py";
+          rev = "e48698fd474fb1b76356101fc97df00eaa610ddd";
+          sha256 = "0k356rw2ack1bf5f0km7fljws5iml9f8scp1ykpf86kskrl2gygq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a856ecd8aca2d9232bb20fa7019de9e1dbbb19f4/recipes/ng2-mode";
@@ -47024,8 +47109,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "03ae5e64592d6d62f30158ccfa804f1b4135a596";
-          sha256 = "1bfdiy5559parkar5k009lkchc9psw8zyjm82z1mr4h1fvwnclgf";
+          rev = "08355643ab2811256b8d78265757d9aab216b38e";
+          sha256 = "1rmq21z3lykzm7iz05jxhl3bb8xdp14f8fk23misxgyjn1yr4lmr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -47293,12 +47378,12 @@
     nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nord-theme";
-        version = "20170506.2351";
+        version = "20170501.942";
         src = fetchFromGitHub {
           owner = "arcticicestudio";
           repo = "nord-emacs";
-          rev = "8962f7c77f2a27c0e0b649653c212fa310cce130";
-          sha256 = "0az5l8y3jg6yk587wvgz1v5671d8p1vf9m0529x9axi1x7yzxry1";
+          rev = "a94a28fa6f1492be228fbeea8f275d62a28c94b4";
+          sha256 = "1xzyh76x4i789xlja9ibvp5dd7dcmdab7mfbvx1m4l6hdghwxp0z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme";
@@ -47376,6 +47461,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/novice+.el";
           sha256 = "1f49c0wv1zsi720g3a8ka3h17n7r81pzz7zfwalz0zxwxmh6jghb";
+          name = "novice+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/novice+";
@@ -48507,8 +48593,8 @@
         src = fetchFromGitHub {
           owner = "OCamlPro";
           repo = "ocp-indent";
-          rev = "d3f250b6029a7afec0d7ddd8770d9c4a7e5b9c7c";
-          sha256 = "1h8w7vcaykhgf4vmrkp1c7y566bzi7av4cfvkp4l01817chrhyaz";
+          rev = "ade286009fdc241270e46ec28d2813c84c6c15eb";
+          sha256 = "0kh1p3f05nh0krcxvbr7l9229g8gf4h2czk4fahs72m7rlh53iqi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent";
@@ -48915,6 +49001,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/oneonone.el?revision=129";
           sha256 = "0ag62z31mb5n50m9qph2ww945pr71j95c5xv7krna1iq01qr8ji1";
+          name = "oneonone.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/oneonone";
@@ -49264,12 +49351,12 @@
     org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-board";
-        version = "20170507.858";
+        version = "20170403.916";
         src = fetchFromGitHub {
           owner = "scallywag";
           repo = "org-board";
-          rev = "2978aee8981a2ff5c09104b2d8b055957b277078";
-          sha256 = "1vbpwzzrl5vq0vwkwn0cr1w9wkfbjd9rmxbpsddm0sbx7k4m3am9";
+          rev = "1daf7bbd52edec82156f0289d42fc7b190f0bc3a";
+          sha256 = "0sm4gr17yi2iki28yimzk5mffp9xfpafk6abi6c6frxab0x42vg5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
@@ -49415,8 +49502,8 @@
         src = fetchFromGitHub {
           owner = "rexim";
           repo = "org-cliplink";
-          rev = "6c134fdda7bb56cc960af87d06a81a6885f6ab0e";
-          sha256 = "1x339lg1q1aq57jycfxwdmipl05wjb0d1b5psqbn37xvmkm3imgg";
+          rev = "4c7c126ad3421ef076e4eb6358c57389b40a5e53";
+          sha256 = "1z514mrppdd3yir6apyf12nqhqsmyzlrh1xfvcb8m6q2f12ny7f2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ddb13c59441fdf4eb1ba3816e147279dea7d429/recipes/org-cliplink";
@@ -50043,8 +50130,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "c1addc8252f360f44b329f09004202bfbbe92605";
-          sha256 = "1q6kvvh284i5fqc6d7zcjrqhqsa2bwws3rndhksnhcv2ckxlyx6i";
+          rev = "cbe544edf33a97ffffd3a03f550ffa85e45c18e4";
+          sha256 = "0jygzkvzf9qf1qy6160kgvfyc3i8rrj8jfalb5j82wigh33j9w2q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -50063,8 +50150,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "c1addc8252f360f44b329f09004202bfbbe92605";
-          sha256 = "1q6kvvh284i5fqc6d7zcjrqhqsa2bwws3rndhksnhcv2ckxlyx6i";
+          rev = "cbe544edf33a97ffffd3a03f550ffa85e45c18e4";
+          sha256 = "0jygzkvzf9qf1qy6160kgvfyc3i8rrj8jfalb5j82wigh33j9w2q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -50080,12 +50167,12 @@
     org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-mime";
-        version = "20170506.2244";
+        version = "20170218.501";
         src = fetchFromGitHub {
           owner = "org-mime";
           repo = "org-mime";
-          rev = "c0e99cfdfa645300a0c114fa6825efdf797da7c0";
-          sha256 = "1rk7w0qsa824sfm1f3djg7vr6kxnvz3znn6vrzb9kcsmrf1y3k2z";
+          rev = "d540da37df26c673b83cc9aab36f2ca6cfed3481";
+          sha256 = "0fcq75cjvd0fh7ic0j28ly40i95clgn5i7j1sj5infycqkrj87xc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
@@ -50513,12 +50600,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20170507.625";
+        version = "20170501.940";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "155a78056a2bdaa11ce0a806ff82989612ac17f6";
-          sha256 = "1jdxfv8kjvncxvcbwxz2rl1swhb20pm48m7dzc90g99zd3356yxa";
+          rev = "3271a5b4a26f69ab8ee7e7fbe87a24d13c48bf3f";
+          sha256 = "1mp5fr9qrgqif8ax0frq855jzxcyqrdxwa6a63irgf2ik7yv3986";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -52182,12 +52269,12 @@
     package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-build";
-        version = "20170506.1759";
+        version = "20170429.225";
         src = fetchFromGitHub {
           owner = "melpa";
           repo = "package-build";
-          rev = "940c991ccd0dab53bd7c120601b3db35669c5e73";
-          sha256 = "18yr4qq3jyf9zhlwqrbfq616svsgn5spnj0s4gsni7kb2ijjh2bp";
+          rev = "0cb81955bb3933ff0c39a488e9a4b3540ee918a7";
+          sha256 = "06gc0ha2aaj20z5rlbn19z4j57l0xc46a3285kqwa5xk3jnk3213";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build";
@@ -52437,6 +52524,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/palette.el?revision=84";
           sha256 = "112b91z1f4p0j4kzrn8110w9pk2fyndjqiiyh0vkwah2ihpsw3pj";
+          name = "palette.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2cdf2d07307007a95d1fe8dc8d2f105c34a26416/recipes/palette";
@@ -54631,12 +54719,12 @@
     plain-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "plain-theme";
-        version = "20170505.800";
+        version = "20170114.1146";
         src = fetchFromGitHub {
           owner = "yegortimoshenko";
           repo = "plain-theme";
-          rev = "1e484668cf272ab1883cb3c1ad9e1e8639de395d";
-          sha256 = "0qhr8mch5fvy5gck5prradlrnx84h6n8nvrcqk6ynqd1nh0pnnzd";
+          rev = "43fc59d487d39e6110230a073f1376ab877aa739";
+          sha256 = "0g44qdpn3ni291awjklia4r26qyiavpjib04k761hfacrdkvsdys";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme";
@@ -54865,6 +54953,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/plsql.el?revision=5";
           sha256 = "1v0wvy9fd1qq3aq83x5jv3953n0n51x7y2r2ql11j0h8xasy42p1";
+          name = "plsql.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb457144c112a7a9de2fc4c634dfd6c2dda2e486/recipes/plsql";
@@ -54922,8 +55011,8 @@
         version = "20170419.303";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/gettext.git";
-          rev = "3531b829b30803bab9e0d9ff62747e061145fec5";
-          sha256 = "107pc3hdarwv7x7mb8dgc79ldl59r09mwrrw9vcsxqnd2w1jbmca";
+          rev = "cde62682dfd40070308af1c2b484a204977e1fa6";
+          sha256 = "0rpah9ljgs15szf6ndg6nj76xx5bzh4cski4bsqa55kbv2k9kd3w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode";
@@ -54999,27 +55088,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    point-pos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "point-pos";
-        version = "20170421.932";
-        src = fetchFromGitHub {
-          owner = "alezost";
-          repo = "point-pos.el";
-          rev = "442bccb40791832cbc2d6f5c8f53be745aea2b73";
-          sha256 = "1p56h8ipgrd5433pc641xccdnsni51l58ll0hv2rp9aqjg9nlgcr";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/23a1e835155fba51f595c10c46487a4c269f43ff/recipes/point-pos";
-          sha256 = "1zv6hx8i8jwq52j4la1ff0ar0bpbs2pb4gcsh9hypghba11gnync";
-          name = "point-pos";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/point-pos";
-          license = lib.licenses.free;
-        };
-      }) {};
     point-stack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "point-stack";
@@ -55047,6 +55115,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/point-undo.el?revision=6";
           sha256 = "13c1iw77ccvrfrv4lyljg8fpm7xqhnv29yzvig8wr8b5j2vsd8bz";
+          name = "point-undo.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ce31bd8f9a1ad4f3252f8cd4ef15984495df18bd/recipes/point-undo";
@@ -55569,6 +55638,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/pp-c-l.el?revision=25";
           sha256 = "0q36bq82lp381jnzf8kapiiglqgibzkhsxlhpgfdg3ynbmw5i1cc";
+          name = "pp-c-l.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pp-c-l";
@@ -55587,6 +55657,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/pp+.el";
           sha256 = "0a1dj9n3n81xal17djj15hqa71cqphjnf9k9z03vnpw8zq0m93lh";
+          name = "pp+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pp+";
@@ -55710,6 +55781,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/pretty-lambdada.el?revision=15";
           sha256 = "0b8m96hbqmgyqmv5f890fnyl9vl2wcsaz8w4b11wdprh82ravp4r";
+          name = "pretty-lambdada.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pretty-lambdada";
@@ -56002,6 +56074,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/project-local-variables.el?revision=1";
           sha256 = "1bb5b6hxg3gvwf0sqwkd97nnipsmr60py0rnsfhgvizn4cj3khhw";
+          name = "project-local-variables.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/project-local-variables";
@@ -56377,8 +56450,8 @@
         src = fetchFromGitHub {
           owner = "chuntaro";
           repo = "emacs-promise";
-          rev = "d3cad4e1f7825404828cd9f5b887f18d3fd83c56";
-          sha256 = "1cn1xcp6yfxp642yibknngf456v29s2qq3y8bsc67ydxjkr5w4gz";
+          rev = "7adac1f8e87d69b3d328add8db396f73254a4303";
+          sha256 = "0xaa54plzlr894j3bp78c9nf8fqwgjscvdrrirh581ff772gx26z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3eaf5ac668008759677b9cc6f11406abd573012a/recipes/promise";
@@ -56503,8 +56576,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "455b61c6b0f39ac269b26969877dd3c6f3e32270";
-          sha256 = "091xxj46nckd4vxg34bsv1283s8l4fa9jhamz6jvxy7br6ajslna";
+          rev = "a64497c709aa8a08f146334afdadf430a1a5c114";
+          sha256 = "1mszq5s8khfk2il55jj0w128h76zcc1mrbsq7xk8n3dj0fna080h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -57347,12 +57420,12 @@
     python-docstring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-docstring";
-        version = "20170508.156";
+        version = "20170314.43";
         src = fetchFromGitHub {
           owner = "glyph";
           repo = "python-docstring-mode";
-          rev = "d35d2e0fbe468743c19a870fec7b28a7e725790d";
-          sha256 = "11y208svg5nxw8k7cbgd2iydng40gwpr85bdnxkywd910sac5p7b";
+          rev = "6ac0b4cab3beb7cb8923f2b273526183179ccf86";
+          sha256 = "0vhhni9wxcwdv7lfdp12a223dvn5w3i5y62cv0gmlsgcr9qdy3cq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e159e59ba0b60326cca0e1ea68fac4b85d54cd24/recipes/python-docstring";
@@ -57410,12 +57483,12 @@
     python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-mode";
-        version = "20170507.953";
+        version = "20170429.55";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "08012d66ea2d678795a766d227b74405e73e1267";
-          sha256 = "1mkbzs2jqhdqr4rn1plmh06pzy3kghlwci47mhac4dpx0wbkmw13";
+          rev = "d6a3bde1d79dc0507a7ad14508c07425ca283277";
+          sha256 = "1zdvpq5ngx6n277r7xm5wyzfmpgpvsz0ilp865xdhkj2c3dyd2zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -58145,12 +58218,12 @@
     rats = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
     melpaBuild {
         pname = "rats";
-        version = "20170505.245";
+        version = "20160315.1145";
         src = fetchFromGitHub {
           owner = "ane";
           repo = "rats.el";
-          rev = "40aee473d369cd27593cb7709f4792d1006ca8f7";
-          sha256 = "0aqs4xja66iwbk39m8w2dm9lcisvjkwym65vinj2ywnp5mkr6jg6";
+          rev = "a5c519b88455a8eacd5e3b72286c96dfc484479d";
+          sha256 = "0dd9yhxwwk16xkwld9c3hpf9bw8zzc1lyvisp0vn6vcd240j02w0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a62cbae1b2d9af2322bb6a27949de8c8bfddc2b7/recipes/rats";
@@ -58658,6 +58731,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/recentf-ext.el?revision=5";
           sha256 = "0pzimhqkrdg2s9zw7ysir740cmaycf6fjs08bmlfjads7vdbjfpg";
+          name = "recentf-ext.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5a36ac5e0fc3599d50d7926cacf16b7a315f0e76/recipes/recentf-ext";
@@ -58802,6 +58876,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/redo+.el";
           sha256 = "1jc4n60spzssa57i3jwrqwy20f741hb271vmmx49riycx1ybx3d3";
+          name = "redo+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/redo+";
@@ -59280,6 +59355,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/replace+.el";
           sha256 = "0bbqmgz4grbg9g4kd5c85wn1icfgqapdkb2v7jmqwg4mc8s7piv5";
+          name = "replace+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/replace+";
@@ -59571,6 +59647,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/reveal-next.el?revision=7";
           sha256 = "0vqacr3q9n772qmyyj35dxkqp79yqrpfhlf8zj70jzg04xzy6f0m";
+          name = "reveal-next.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38e5dd845c99acaae719562595059154a08a5f00/recipes/reveal-next";
@@ -59694,6 +59771,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/rfringe.el?revision=1";
           sha256 = "02i5znln0aphvmvaia3sz75bvjhqwyjq1blf5qkcbprnn95lm3yh";
+          name = "rfringe.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rfringe";
@@ -59709,12 +59787,12 @@
     rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "rg";
-        version = "20170506.2235";
+        version = "20170415.938";
         src = fetchFromGitHub {
           owner = "dajva";
           repo = "rg.el";
-          rev = "261ed756377285f0f8941b7a33866ef538465d74";
-          sha256 = "1fs367w5695v8kvwka1w9kykgpq3qp1209cxkxs096rlkxhbdvv5";
+          rev = "44eca47f049b25bd45e8cbc7e6579911e552b88a";
+          sha256 = "0riv5cr5sy37pcwvg0yjwi3qkvqr081503j487mcc7dcyvwlcrzy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@@ -60045,12 +60123,12 @@
     rpn-calc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "rpn-calc";
-        version = "20170508.100";
+        version = "20170402.1833";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "rpn-calc";
-          rev = "ae4bf0dd8a922ea41b228fac81dee2c10b11982a";
-          sha256 = "03kvrvafwm7czg8jb4r9wggrabczdd809wr2g62z1wqjiz94fxnp";
+          rev = "4d8aa137b31392a76a0fd4eaf676291029c1aad9";
+          sha256 = "0m373xzxx6ywrxll0qqsnyx55bfp0phbw6mcczz53yw9kpf3mf22";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/47d5b3c931cdbc2351e01d15e2b98c78081c9506/recipes/rpn-calc";
@@ -60108,12 +60186,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20170508.1209";
+        version = "20170501.2337";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "3fca941f4ca64689765648fa9e0e2e0b63b2244a";
-          sha256 = "1bg357cz60spwmpma8xdzrvh50znp3fz1w11gza9iirv4fnyg00j";
+          rev = "298ba7caa775089e2e4a95612c5f2b0eacbe4414";
+          sha256 = "14s5y1hsp9gr6llla8jpg3sk0lazs2a3sgkmg1lmbg3xr59lcwaz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -60174,7 +60252,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "58612";
+          rev = "58552";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -60194,6 +60272,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/ruby-block.el?revision=12";
           sha256 = "0c4vy9xsw44g6q9nc8aaav5avgp34h24mvgcnww468afiimivdcq";
+          name = "ruby-block.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e2149ce3baef9ac01d5b2e8b1a933a3e1206015f/recipes/ruby-block";
@@ -60254,7 +60333,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "58612";
+          rev = "58552";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -60880,12 +60959,12 @@
     sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sbt-mode";
-        version = "20170508.1";
+        version = "20170427.1535";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-sbt-mode";
-          rev = "1ab82c187c49440b08fc468957fa10b79ac603b8";
-          sha256 = "1pwi6i5q7fzvx8ychg2i0ndn2czhrl8fr86695vh99wmy7shvw6i";
+          rev = "6f2cedfd07d2fa68b12bc435f9f30b32b8d9d2b0";
+          sha256 = "1jaxaxjd6jzmzz49f1z1prjardql6nqbrgk3hbmfqshvlm6hq344";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode";
@@ -60905,8 +60984,8 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "ec1c3fd61152f119cb6bd7efeef4816bea8f8e65";
-          sha256 = "00lvh1ix9xs9844mp1yz1gfwx8wi53jzgy4wrg8vgwwbd5mrkdvw";
+          rev = "ddef3d169aa0f9cf7a7fd058ae2cf44a313b54cb";
+          sha256 = "1k5ii287vgp26xccais6qqlk0kr7rbz17nhciy691w0d247zvbff";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -61281,6 +61360,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/screenshot.el?revision=8";
           sha256 = "0q7yxaaa0fic4d2xwr0qk28clkinwz4xvw3wf8dv1g322s0xx2cw";
+          name = "screenshot.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/24f113097db4cc27a2e9c7b9086af6d263e6fcb7/recipes/screenshot";
@@ -61467,6 +61547,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/second-sel.el?revision=28";
           sha256 = "1sgwza2ka3iqsajnppq2vd150h1wbkzzi04rk7bzpqj32dyh7gbx";
+          name = "second-sel.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/second-sel";
@@ -61779,6 +61860,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/sequential-command.el?revision=3";
           sha256 = "0vg8rqzzi29swznhra2mnf45czr2vb77dpcxn3j0fi7gynx3wcwk";
+          name = "sequential-command.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31db031dc8712e89042d4ce80438a4267a241739/recipes/sequential-command";
@@ -62425,6 +62507,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/showkey.el?revision=11";
           sha256 = "143889knvy6ifvq759869gbjfg10k10mi2by2hajcgzqhby72h61";
+          name = "showkey.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/showkey";
@@ -62759,6 +62842,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/simple+.el";
           sha256 = "061vw3w8gl1lcjy67ina4w496i91addsl5s3xbffk2q6k1qhjsdi";
+          name = "simple+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/simple+";
@@ -63026,12 +63110,12 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20170504.629";
+        version = "20170430.750";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "5bd003364f0de8737cedfacb0766da0dd6e3496f";
-          sha256 = "12cwpra9jgixab54pd7pb7g073b5gbhmsjbhfnnk38yqlgdrzisc";
+          rev = "52c55f3ab9818f09849a27edf57653672779f681";
+          sha256 = "1z4c8aghp33q1rwydknqqcs68svp3hr77399ng7rqdlkdxfhrbj6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -63470,6 +63554,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/smart-compile.el?revision=7";
           sha256 = "163s97h1a9pjz3pqyn2mhh4mf05b7yycp29k5wnk3c9zc71pafvp";
+          name = "smart-compile.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2e6c3dd7b8e19193d070fd41c2be4bcd61f1022/recipes/smart-compile";
@@ -64687,12 +64772,12 @@
     spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spaceline }:
     melpaBuild {
         pname = "spaceline-all-the-icons";
-        version = "20170506.408";
+        version = "20170503.209";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "spaceline-all-the-icons.el";
-          rev = "481329d1d1c4c505a91b7f2ac231f77a19e2c74d";
-          sha256 = "15snhm5rq0n31g9hk5gzimhjclfll67vi7avhrhd9z9x6dvq0sp4";
+          rev = "40e382659b8a41838274cfaca5001616648fabdd";
+          sha256 = "1i3n0ndgfps0mrvgqkskljwzaflqbvb1a96678m314bfvv64w0ba";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
@@ -64816,6 +64901,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/speck.el?revision=12";
           sha256 = "0zn7gjrga1ly1za04jd4s61m1dwkyy960x7g3x9hn4szqvpcsvfa";
+          name = "speck.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/speck";
@@ -65295,6 +65381,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/sqlplus.el?revision=25";
           sha256 = "04wqy4ss6499rpn0rnczmn39yi78xkqslblyq4xb700xzmzn7sg3";
+          name = "sqlplus.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/41b1fc299cf8eeba1916a58ad8f50eb4560f0252/recipes/sqlplus";
@@ -65436,12 +65523,12 @@
     ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-config-mode";
-        version = "20170506.2330";
+        version = "20170413.918";
         src = fetchFromGitHub {
           owner = "jhgorrell";
           repo = "ssh-config-mode-el";
-          rev = "2d47d28a527d2e5a6aa350ef5f50e0c05378ad35";
-          sha256 = "0x8153ps266b359ll15w792qzqzpqs0jllc006jd59n71frdi8zv";
+          rev = "ff82fd1e48a8fde61c845eb213584d67e754e8a1";
+          sha256 = "1p1kplnkpnhi28fj3j8f5f0v0kccgmx5knyxr2kwn1fq7s9zqbh8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/750b16ee631b4c2014f2ebf767609bab4b8ee421/recipes/ssh-config-mode";
@@ -65457,12 +65544,12 @@
     ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-deploy";
-        version = "20170506.932";
+        version = "20170423.2332";
         src = fetchFromGitHub {
           owner = "cjohansson";
           repo = "emacs-ssh-deploy";
-          rev = "6d1c10c2b5bb8a1a1f30ab3850970c731ff54086";
-          sha256 = "09bmvgvkhn3cg8lwav77zvsfp5kr3vh6b1mg7cay7jw4m6cjscx4";
+          rev = "56da852dd3b34add0b2cce499cb07f076767a976";
+          sha256 = "14c8grlbjymdcvkpw6fv80qd9b3l3kmji4xqqh9z2hdvifn412a3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@@ -65566,8 +65653,8 @@
         src = fetchFromGitHub {
           owner = "lueck";
           repo = "standoff-mode";
-          rev = "cecb6bb0bbb3692ab9179376d88d14327965a43b";
-          sha256 = "01fdv5v8hlckqdsjq5m4cvghq7mvcwh4mqv49mh2dlahs5m055dk";
+          rev = "a1bea7231a6d25fc05f88c9af588538fea664caa";
+          sha256 = "0cxnph1n1f77xhdafl5glmgqysg89k4lk2fy8384gbyhamfj95v4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/98858a45f72c28eec552b119a66479ea99b60f93/recipes/standoff-mode";
@@ -65752,6 +65839,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/sticky.el?revision=4";
           sha256 = "18izyia1j3w2c07qhkp9h6rnvw35m5k1brrrjhm51fpdv2xj65fy";
+          name = "sticky.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c3a9689703b8c8edbffdc966cded9ea98fc8762/recipes/sticky";
@@ -65917,6 +66005,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/strings.el?revision=49";
           sha256 = "08sq20ys4xkkg11jyrnlzibl5v73i7zlnj28ygivy3sqvp07z7iz";
+          name = "strings.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/strings";
@@ -66143,6 +66232,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/subr+.el";
           sha256 = "1vrs390vqcsjwzf6pzcvqjc3mliac66g7g5kifvz9zp0v3bq6x7d";
+          name = "subr+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/subr+";
@@ -66308,6 +66398,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/summarye.el?revision=4";
           sha256 = "0q5m8d6p9aqbfx17zgznkqw2jgh027xix4894wrdz91670zxd3py";
+          name = "summarye.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/85e28911e6b8173188f45331c6540681691223f2/recipes/summarye";
@@ -66557,6 +66648,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/swbuff-x.el?revision=9";
           sha256 = "1fkicyjvanh8yk2y27sq075sarcyqhsdz0r4xhillpnv34ji98r5";
+          name = "swbuff-x.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42bac16fa83eb3df693835326444f4bd4255cf1d/recipes/swbuff-x";
@@ -66639,8 +66731,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "f565f76dfb3a31becc32c807916c011cde6c4e64";
-          sha256 = "1dl39b4c7jij0gxdri2li6nkm7x73ljhbk0n1zwi6lw4xd7dix6p";
+          rev = "3a00c5a18da3547983e29be496e538a7130f85fb";
+          sha256 = "0j1d2zbjj527bs6igmnibjyfkb84icgdwkablp2jpafwpxi8jpgh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -66911,6 +67003,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/synonyms.el?revision=63";
           sha256 = "0456mmp3niljpghqcngknqkrxmpkba3n95ab4pf0b0021z2zjyxk";
+          name = "synonyms.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/synonyms";
@@ -67411,8 +67504,8 @@
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "tawny-owl";
-          rev = "c2ed2499796b91c31f249211717e18f475334404";
-          sha256 = "0q34k4mnd7hkgm9p0q7b8x8j5p3dllm5xxhjbadm6mlygr6wx3bj";
+          rev = "de9ac4ab45d311fc9f5bf2d7fde73178f4562731";
+          sha256 = "1j2kf4jp3iyafmp75da80a4s99d5l0svf53lwbqa8k66q9k9nhzh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode";
@@ -67579,8 +67672,8 @@
         src = fetchFromGitHub {
           owner = "dbordak";
           repo = "telephone-line";
-          rev = "d0428bbd5c308b7c249359be8c854fe80a2905a8";
-          sha256 = "1zr4c63jmjd4lmbrp975c92wh9nn7861dkf5q7mjsglfdf0zp1wj";
+          rev = "85d25085ef958559f37bbe19c68762c725ae2759";
+          sha256 = "1adwngyv2al9pnzs36227bj7340jby846nay101dafc25alcnj4f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line";
@@ -67852,8 +67945,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "a1cf72d9e2ed32ac3c75583cd9db75c5f981382d";
-          sha256 = "08njp03bcihb28sx0n5ngp8xsbc9pdsvc18h0k4c3vybvv3km88n";
+          rev = "0ee21b6f46c4e9c0a5678f7bc6c4b77d1b6f7876";
+          sha256 = "15alrx83laf5ykgd8d0xk699hlll0b776pir1pzrwdgblcs1y9lz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
@@ -67873,8 +67966,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "a1cf72d9e2ed32ac3c75583cd9db75c5f981382d";
-          sha256 = "08njp03bcihb28sx0n5ngp8xsbc9pdsvc18h0k4c3vybvv3km88n";
+          rev = "0ee21b6f46c4e9c0a5678f7bc6c4b77d1b6f7876";
+          sha256 = "15alrx83laf5ykgd8d0xk699hlll0b776pir1pzrwdgblcs1y9lz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
@@ -68145,6 +68238,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/tfs.el?revision=9";
           sha256 = "16byw8ix7bjh5ldr8rymisq2bhc5sh7db6rhpf0x28yd6mmzn73v";
+          name = "tfs.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/tfs";
@@ -68226,6 +68320,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/thesaurus.el?revision=6";
           sha256 = "0zcyasdzb7dvmld8418cy2mg8mpdx01bv44cm0sp5950scrypsaq";
+          name = "thesaurus.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/thesaurus";
@@ -68245,6 +68340,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/thing-cmds.el?revision=57";
           sha256 = "0zi7hbdb5w0lry09rdsxmb0kqnfp6s72kn0z5npfhvwalkcpywbq";
+          name = "thing-cmds.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thing-cmds";
@@ -68263,6 +68359,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/thingatpt+.el";
           sha256 = "1k9y354315gvhbdk0m9xpjx24w1bwrnzlnfiils8xgdwnw4py99a";
+          name = "thingatpt+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thingatpt+";
@@ -68366,8 +68463,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "224c334e50a553504385dd001dadf31f7346b30a";
-          sha256 = "0xhpal5a8kap5ngn6p22i6ww1ha1d1yg44a47jfkgfbwx1fmykmj";
+          rev = "19baeefd8c38d62085891d7956349601f79448b3";
+          sha256 = "03sfqcxgvg68y16pygxsgpl5dj7yfr0abyjhlraxq3qlc8bcy1rb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -68387,6 +68484,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/thumb-frm.el?revision=62";
           sha256 = "1mfz4gkq71sp9q7pa8q0md36g7x0dpsqz0np507dx2kypzqhklpd";
+          name = "thumb-frm.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thumb-frm";
@@ -68447,6 +68545,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/tidy.el?revision=9";
           sha256 = "0psci55a3angwv45z9i8wz8jw634rxg1xawkrb57m878zcxxddwa";
+          name = "tidy.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf079dbd04675ecd5f511b940d7cc5f80ccc94c4/recipes/tidy";
@@ -68789,6 +68888,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/todochiku.el?revision=16";
           sha256 = "0fhlyjl0a3fd25as185j6dmch0wsrf1zc59q29lhjximg9lk3hr5";
+          name = "todochiku.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/todochiku";
@@ -69038,6 +69138,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/tool-bar+.el";
           sha256 = "09myj10ifjjc43invxbiinskv5xllkqvqfnzmc7893k2hp2miczm";
+          name = "tool-bar+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/tool-bar+";
@@ -69056,6 +69157,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/top-mode.el?revision=3";
           sha256 = "0a5rl1cgznycqwx4r48mh69lgm8ixbnlfzbqdyvclgm8fldbannn";
+          name = "top-mode.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/top-mode";
@@ -69599,12 +69701,12 @@
     tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tuareg";
-        version = "20170508.930";
+        version = "20170221.1141";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "d1a7ce84c51a3dc5639ebb643bd7557a55c91f76";
-          sha256 = "056hdzh1kgy33s7pnqn59jwhrs5fqh8rzsxq4h3spadyyga33k36";
+          rev = "f242fe45dc47aab8fe69392304ebc2c779c411e0";
+          sha256 = "07lz7s7z913h0mvmjnvvg9m36pc5r9nrg1a6z2wxszbccjvkz95b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -69680,27 +69782,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    turing-machine = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "turing-machine";
-        version = "20170505.804";
-        src = fetchFromGitHub {
-          owner = "therockmandolinist";
-          repo = "turing-machine";
-          rev = "41e367e54fbeff572f599f2f321ffc863601484e";
-          sha256 = "0qlm7y3pm8sfy36a8jc3cr955hqsmypzshbgxfnmcmz7wl96dplh";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a003b40a52a92b3ab4d1ffc003f570d4fa6bfbde/recipes/turing-machine";
-          sha256 = "1ndy953q9hr1psqqkkqsffyvj800cnqdxcrixqiw0ls77f2kczcn";
-          name = "turing-machine";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/turing-machine";
-          license = lib.licenses.free;
-        };
-      }) {};
     turkish = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "turkish";
@@ -69896,6 +69977,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/typing.el?revision=13";
           sha256 = "0mgvpdp3vlvjy32d163h2mzsf9j2ij2f542sdr3rsy8l80n6nx31";
+          name = "typing.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1bc0c7b53431a9d2bc41c9a7a755bdad0fa0f5cf/recipes/typing";
@@ -70019,6 +70101,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/ucs-cmds.el?revision=23";
           sha256 = "072swg5iyx9n4xpdm65ydh2z7g11jqi3jjwkhcd7a389lavfqnbw";
+          name = "ucs-cmds.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/ucs-cmds";
@@ -70076,12 +70159,12 @@
     ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ujelly-theme";
-        version = "20170506.941";
+        version = "20170430.1443";
         src = fetchFromGitHub {
           owner = "marktran";
           repo = "color-theme-ujelly";
-          rev = "148a173441e7371a01382446d683bfb251f00cc7";
-          sha256 = "05bp1szqrbqh4hvd4gmhk9hfmki0xhib7z762bd4jabh6k68kap7";
+          rev = "0bfbef56427f077a6630c803d312a82dc1743550";
+          sha256 = "0wgzn1wlyiqb0bz2wrzh5pv5ljgqg99x7vc6pzr106ia13ccvpnp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme";
@@ -70121,6 +70204,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/unbound.el?revision=11";
           sha256 = "0awmzz9cfr17ggpzsgxqqhz5946l7705vvkfaiz7qx9wg0pbch18";
+          name = "unbound.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/118e8df30e4caf2a5ef668af8970cfbfc2327004/recipes/unbound";
@@ -70653,6 +70737,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/usage-memo.el?revision=12";
           sha256 = "00g1zj5fjykdi6gh2wkswpwx132xa6jmwfnrgfg5r96zwb8pib4i";
+          name = "usage-memo.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ae8f3adf42300fc0d8f0c5474edf839614d84978/recipes/usage-memo";
@@ -70714,8 +70799,8 @@
         src = fetchFromGitHub {
           owner = "diml";
           repo = "utop";
-          rev = "fa27469e609fab67b2170b867370f5fe2e247b50";
-          sha256 = "0wgwsn54fisvxd4kmwb0197mgz6bm6hiav1ygzqi4zmc6j2inkhh";
+          rev = "6759d18811e5ad12fb9e609f55da4a27b80f0133";
+          sha256 = "0ai77jc7ys4s8aqaks69i7sj1s2ig9chlm2b6lb0czhwrxjkzhr1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
@@ -71214,12 +71299,12 @@
     vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }:
     melpaBuild {
         pname = "vhdl-tools";
-        version = "20170508.735";
+        version = "20170424.659";
         src = fetchFromGitHub {
           owner = "csantosb";
           repo = "vhdl-tools";
-          rev = "282274b319f2c3598ac6bbdd27a8b7ca40b0bb0e";
-          sha256 = "0va5aqij3gan3j37jjhx8a8bv0zdpid5x18jfynzizlyk68fc196";
+          rev = "9b6b9f20004dd33c5b603e09b5ca133bc864d1a4";
+          sha256 = "0blgbrbp5bkrcl0dpfwp8akcdgx9ng730kk2lr3g2rzr5v7y8dck";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools";
@@ -71595,6 +71680,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/vline.el?revision=17";
           sha256 = "1ys6928fgk8mswa4gv10cxggir8acck27g78cw1z3pdz5gakbgnj";
+          name = "vline.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aa860c2ccbaeb19d8b866919cdc45549d9cf9537/recipes/vline";
@@ -71761,6 +71847,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/w32browser-dlgopen.el?revision=25";
           sha256 = "1fkkrqwhkg58jjjsjf0fzwabaaxarjylp22zng1id6hqfsm7r1cd";
+          name = "w32browser-dlgopen.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/w32browser-dlgopen";
@@ -72151,12 +72238,12 @@
     web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20170503.1134";
+        version = "20170501.1032";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "642b750a139ec6a13fdb5ce4182f04228975c159";
-          sha256 = "1xz8dy2amjm99qxv0m4c91cfpzqcabs7p3b8rk9wfy6arsmsfn56";
+          rev = "c658359e80e6ba07f09aa72c5d8572039152857a";
+          sha256 = "1gjbm4qzvd0sl44278s4wa96xk7bg0m02mj5bnlmjds9a73lkb0b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -72256,12 +72343,12 @@
     webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, request }:
     melpaBuild {
         pname = "webpaste";
-        version = "20170508.1223";
+        version = "20170503.105";
         src = fetchFromGitHub {
           owner = "etu";
           repo = "webpaste.el";
-          rev = "f08a2dcf67503afa76225a981eef8e6270b3adf6";
-          sha256 = "03f7n7c4ppx7m32s516fr573rrqqwnhnjl2m2hix3ncrpzs052ma";
+          rev = "dab97dd11b0e5886c4c401fff917474ee757c2aa";
+          sha256 = "0m1vzi5gall015jps7gcfd3c27vr1sahssa0fm5rgmiqwxidcz7j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@@ -72592,12 +72679,12 @@
     whitespace-cleanup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "whitespace-cleanup-mode";
-        version = "20170505.1923";
+        version = "20150603.447";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "whitespace-cleanup-mode";
-          rev = "d375bfb61cb70947a93004cba8ea17a0bc76f5a9";
-          sha256 = "0w6jwg1lyz0hwkhbx3kx6yddakff6azj2ipyxw26rv886gx8a226";
+          rev = "cdc6ee4e33b9e637afabf2075198c5616a44f91f";
+          sha256 = "1j6gh435r52p8kjnzqwbnkynmdq541clwxlnzpsjw8n5mspp7g25";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b461cfe450d7ce6bd0c14be3460cacffc1a32e6f/recipes/whitespace-cleanup-mode";
@@ -72658,6 +72745,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/wid-edit+.el";
           sha256 = "0w2hjahcq68inabjbdyh3a0wcxd6pdgsp81iqcikxzfvwpzm35a9";
+          name = "wid-edit+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/wid-edit+";
@@ -72802,6 +72890,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/wimpy-del.el?revision=26";
           sha256 = "0impy9kp1xnhs0834azzndx93p8q53dxdqd9hz0n1mg0h8331c13";
+          name = "wimpy-del.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/wimpy-del";
@@ -72967,6 +73056,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/window+.el";
           sha256 = "1l6fwrd2f58xpf7cprp354bq2fz0hvl9bz73hrbrzyqvnd9kix61";
+          name = "window+.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/window+";
@@ -73716,12 +73806,12 @@
     xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20170506.1456";
+        version = "20170429.2232";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "2daff1543e6fc4ac2c3b18b4d3d7e51fc020ff7e";
-          sha256 = "1f5akqis4q1sm3qxwg2vq0sd62b6dqmxyx517l9gpkhkp2d5y4zw";
+          rev = "775f8822018a414b993996718a1e20b77b5b106c";
+          sha256 = "1v7bw4bf8ghgbqcabiv9iy9wyb99ynic95xm8zs2w8scj508yaph";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -74496,6 +74586,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/yaoddmuse.el?revision=104";
           sha256 = "0vlllq3xmnlni0ws226pqxj68nshclbl5rgqv6y11i3yvzgiazr6";
+          name = "yaoddmuse.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/yaoddmuse";
@@ -74511,12 +74602,12 @@
     yapfify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yapfify";
-        version = "20170504.2218";
+        version = "20161202.1055";
         src = fetchFromGitHub {
           owner = "JorisE";
           repo = "yapfify";
-          rev = "6bc89053a100f09f0568f67f3d47a3f94c392df2";
-          sha256 = "0mg94x6kx6wsql0r12pasb84dhq23gpzgk3n8i09w4qyjajhf20y";
+          rev = "c22db3683133ed4aff78e280983ec0621ca1cf1f";
+          sha256 = "05nilm9adpymx1gs1qvcrrgyv13vf5lm13rp12ljbndk0gx4n8x6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/060c32d8e9fdc56fe702d265a935d74d76082f86/recipes/yapfify";
@@ -74657,11 +74748,11 @@
       }) {};
     yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "yatex";
-        version = "20170503.1833";
+        version = "20170306.55";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "428584533eab";
-          sha256 = "1nrvlziqfsyvsk09ynpww99z4vb8zv8h2jxsslvx1nm1shyn2ckh";
+          rev = "7bf780961390";
+          sha256 = "19nxjabwr3c5sjii2pwlgak751wq9h12yp7xd6nz8i6f75md59xs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
@@ -74719,12 +74810,12 @@
     ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }:
     melpaBuild {
         pname = "ycmd";
-        version = "20170507.2238";
+        version = "20170501.2313";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "365c80fc32b061b33ae87ee351c4c3bc7a533cf8";
-          sha256 = "1xqn7jq2b7brnr8p7ln1y8k7psnljic3jy0scypka889zd1ggrbk";
+          rev = "4c3dad6229d6c2b628490c599b53cdc707531659";
+          sha256 = "1iyq7njhc1kjj9gkpy958dd4vkwzkr2b31bvv97sj2l1lhg63gwd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -74979,12 +75070,12 @@
     zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "zerodark-theme";
-        version = "20170505.439";
+        version = "20161212.1151";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "zerodark-theme";
-          rev = "60615d101769694038b17a2c75bb31c26f36a042";
-          sha256 = "09fpyhprmavv1fa97wa7lf182nhiw0797rh73xbhf7xhn1c22gbj";
+          rev = "c7e4d3aa3062aa6c89408720e5b68856a39cd401";
+          sha256 = "0yqb9wbq4ava9i02skyvjh6n1gd9lcp7lz1a2skzihc2hmnjw2jg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";
@@ -75192,6 +75283,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/zones.el?revision=28";
           sha256 = "1mgfv9q4mwng0cqni13kmsridbfqsw66z5cgynlrvagga6v94bq0";
+          name = "zones.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/zones";
@@ -75232,6 +75324,7 @@
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/zoom-frm.el?revision=44";
           sha256 = "03f3clivm7nfgg16k9pcshdwbwmjaqk0lcdm9d0180dl1c1z2wvs";
+          name = "zoom-frm.el";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/zoom-frm";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 37b52f00eec..8f3dd9a313b 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -1645,27 +1645,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "apiwrap";
-        version = "0.1.2";
-        src = fetchFromGitHub {
-          owner = "vermiculus";
-          repo = "apiwrap.el";
-          rev = "2feb4a9c58a105867197f92c0b27f1de8d213f45";
-          sha256 = "0yyl2zn02mnhpg6xfcywypg3yprabgkzi9spr407nia86ljrqqss";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap";
-          sha256 = "0n50n1n5pvcgcp1gmna3ci36pnbanjdbjpgv7zyarlb80hywbiyw";
-          name = "apiwrap";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/apiwrap";
-          license = lib.licenses.free;
-        };
-      }) {};
     apples-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apples-mode";
@@ -4353,12 +4332,12 @@
     cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cmake-mode";
-        version = "3.8.1";
+        version = "3.8.0";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "8bd6af0d6386d1e0b26ff594b7d42621d67b5985";
-          sha256 = "10rij858aq3hdkdpackhmpmqj3zlfahc3jbfjffk2yicnwmnkb6s";
+          rev = "da7833c5bb1f331162d46a2c664a443c1c641089";
+          sha256 = "0ca99p3i0q0f313yzfzd62pc4gl385lr1rfsx4z5vlr24ap7ipzy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8456,12 +8435,12 @@
     elpa-clone = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elpa-clone";
-        version = "0.0.6";
+        version = "0.0.5";
         src = fetchFromGitHub {
           owner = "dochang";
           repo = "elpa-clone";
-          rev = "92f4c9d3570ad002575a90d0cc4a522c203a1110";
-          sha256 = "0m5w5wgyslvakcqpr3d198sy3561w2h002gflw0jp47v17hba1r7";
+          rev = "144bee09445b30cbf4f60b371a289f0d75a387aa";
+          sha256 = "1k80y3wcqvhdbc0w5ybicn2hqjldp7b4jwraca2b99676c0yiq25";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/11861edd9c7f9deebd44fd1f8ef648e7a04caf2b/recipes/elpa-clone";
@@ -8861,11 +8840,11 @@
       }) {};
     emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "emms";
-        version = "4.3";
+        version = "4.2";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/emms.git";
-          rev = "4cb3ae341847e8e8586373a95a458a453469812d";
-          sha256 = "0bmxlrk2p51bw5lgh2arkcz1v9bw6rpflwk778rdzn0rhzhvhp5b";
+          rev = "6736d2e86d2909ef44759b1162e006bd5cc07547";
+          sha256 = "1qxdxy2grh0fdx50w1m9rmpvygxcywis4qjzi0mrpv2i7rwn8qal";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
@@ -9441,22 +9420,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "20.0pre1";
+        version = "19.3.2";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "4f03eba5294f1c1bc922b07f1267e6b0099fd4b5";
-          sha256 = "0ryi6r4ahh5dsl04nqgqhzymzm9krxr0kf4r3v3xg1yzw6d4g2a8";
+          rev = "6acb7d6fb8d23c0b0b78d30a618d2636ad463e6e";
+          sha256 = "1a3yk18sr3y524jl8icp8qh5j143ykxs51xdwz2bzxac2y78k0xk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
           sha256 = "1cs768xxbyrr78ln50k4yknmpbcc1iplws3k07r0gx5f3ca73iaq";
           name = "erlang";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [];
         meta = {
           homepage = "https://melpa.org/#/erlang";
           license = lib.licenses.free;
@@ -9884,12 +9863,12 @@
     ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ethan-wspace";
-        version = "0.7.1";
+        version = "0.7.0";
         src = fetchFromGitHub {
           owner = "glasserc";
           repo = "ethan-wspace";
-          rev = "e055ee6730c0b03525d32e67511ef6c51e4c29e4";
-          sha256 = "0ik3y60xd3ap1pg5dr5ab6bq4qh8gblpgz1iiprmv7acr3ckzc41";
+          rev = "b8eae49ed3e7f646c16234970af5663e3090e720";
+          sha256 = "1xqc4lqzirpmr21w766g8vmcvvsq8b3hv9i7r27i5x1g0j4jabja";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9454f3a58e3416fa60d8411b0db19c408935408f/recipes/ethan-wspace";
@@ -10849,12 +10828,12 @@
     eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eziam-theme";
-        version = "0.4.1";
+        version = "0.4";
         src = fetchFromGitHub {
           owner = "thblt";
           repo = "eziam-theme-emacs";
-          rev = "df2ae56e1ee5cc41c335ca6fd7ead3b99b3c5edd";
-          sha256 = "0nsch4zzqd64rq0y75knfp95nn5nq2hvvgcjhq0i075g2vwhf73w";
+          rev = "3e888e489774e1f6e5ce15fda46296d2fee0de1f";
+          sha256 = "1rxyah6xcdjf3zx1b0gn56wi6gsk95ifsarca67ir3lc1797ldwk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
@@ -11143,12 +11122,12 @@
     find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "find-file-in-project";
-        version = "5.3.0";
+        version = "5.2.7";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "9416c3db483dc86530a204f5ae1b587c5c3c8cec";
-          sha256 = "16mwa3si70z2q8g859vbc0al3h8mjig8z6m3l7a0lrx373mp205j";
+          rev = "1ac2c0a717a1a0b70839625f2aaad2c18c21f729";
+          sha256 = "0vmigmbr4fc36sahpf0bj65isa4sf1xhn1v2qvnidbx8qg18hm2f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -12869,27 +12848,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    free-keys = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "free-keys";
-        version = "1.0.0";
-        src = fetchFromGitHub {
-          owner = "Fuco1";
-          repo = "free-keys";
-          rev = "edfd69dc369b2647447b7c28c7c1163b1ddf45b4";
-          sha256 = "0xgifa7s9n882f9ymyyz9gc11xfbj3vfpnxiq1fqfm5hmwx9pwbc";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/55067e899ba618d4394ad9657322c92a667a0774/recipes/free-keys";
-          sha256 = "0j9cfgy2nkbska4lm5z32p804i9n8pdgn50bs5zzk1ilwd5vbalj";
-          name = "free-keys";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://melpa.org/#/free-keys";
-          license = lib.licenses.free;
-        };
-      }) {};
     fringe-helper = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fringe-helper";
@@ -13592,12 +13550,12 @@
     git-commit-insert-issue = callPackage ({ bitbucket, fetchFromGitLab, fetchurl, github-issues, gitlab, helm, lib, melpaBuild, projectile, s }:
     melpaBuild {
         pname = "git-commit-insert-issue";
-        version = "0.3.1";
+        version = "0.3";
         src = fetchFromGitLab {
           owner = "emacs-stuff";
           repo = "git-commit-insert-issue";
-          rev = "5f08c17bf93b17915415d435ee41923d924fe20b";
-          sha256 = "11my5apnyhdqh0pmq9wdjd1iah415a5nw87sk586cb3vxnbn5qas";
+          rev = "7ee9dc88acc1e766700a6170a2ba6b0b853220db";
+          sha256 = "1fi0gy0093dwdcsl7ikzdjxklqrf1p6f99bpxi4xzk2waca70klf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/git-commit-insert-issue";
@@ -14726,12 +14684,12 @@
     grails-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "grails-mode";
-        version = "1.0.2";
+        version = "1.0.1";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "f8e9628916d4d41e1816b53d02f0b5a00c499555";
-          sha256 = "1myb15n207yl2cgacmn105r1xbjq076paq6anvw53smy3fhw9sh9";
+          rev = "50801257d376fd7383ddf9c19ff567183c24ad0b";
+          sha256 = "0wy8iw12b9bs7xza8jjnjvggr59rgbsgn1kk2g0pj0nppvfdrvjm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -14888,8 +14846,8 @@
         version = "0.1";
         src = fetchhg {
           url = "https://bitbucket.com/tws/grass-mode.el";
-          rev = "1ae8eae88117";
-          sha256 = "1sl3d5759fjm98pb50ykz2c05czb2298ipccwj2qz2hdzq63hfv8";
+          rev = "5383fff2996b";
+          sha256 = "1igbdrs14dmaa5mbhq3jnrkq16nndingflpnwxi921dag613c3jz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grass-mode";
@@ -14987,12 +14945,12 @@
     groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "groovy-mode";
-        version = "1.0.2";
+        version = "1.0.1";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "f8e9628916d4d41e1816b53d02f0b5a00c499555";
-          sha256 = "1myb15n207yl2cgacmn105r1xbjq076paq6anvw53smy3fhw9sh9";
+          rev = "50801257d376fd7383ddf9c19ff567183c24ad0b";
+          sha256 = "0wy8iw12b9bs7xza8jjnjvggr59rgbsgn1kk2g0pj0nppvfdrvjm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -15134,12 +15092,12 @@
     guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "guix";
-        version = "0.3.1";
+        version = "0.3";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "35c1506bec0cb43629d30cae8be6cd7f793fff8b";
-          sha256 = "1dlh4ppnbliv2ipfysdrnpix5kg6nwjc0468whi3w758nwpkamzc";
+          rev = "9cc6dba6ac9ede2855a1a95a22bc7353949f4362";
+          sha256 = "0yyq2z3vsgib9r8paaj7ls4f8rwxmnhi5jsydzdmwqw1hrpkclv9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -15553,12 +15511,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "2.7.0";
+        version = "2.6.1";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "bdc6711656954562ed721545ac22ee3a507110a3";
-          sha256 = "1zx41nwfpzc0zrzi3bm6pmja0rl1jl3brbybiww4f4kqh34d0ddj";
+          rev = "9db9ed21c8d6454c60eb50c7cc935540d31abc43";
+          sha256 = "1vanva75xv52yg68mqcbxvdbrkq66qb883sjvg3fsg4slwivbiz6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -15868,12 +15826,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "2.7.0";
+        version = "2.6.1";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "bdc6711656954562ed721545ac22ee3a507110a3";
-          sha256 = "1zx41nwfpzc0zrzi3bm6pmja0rl1jl3brbybiww4f4kqh34d0ddj";
+          rev = "9db9ed21c8d6454c60eb50c7cc935540d31abc43";
+          sha256 = "1vanva75xv52yg68mqcbxvdbrkq66qb883sjvg3fsg4slwivbiz6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -17296,12 +17254,12 @@
     hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hindent";
-        version = "5.2.3";
+        version = "5.2.2";
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "hindent";
-          rev = "abe2933e3d1f82e4eecfba11ffed27f7f52ca469";
-          sha256 = "12f1mmkapjf5l6ka3k09s4i3qg5pk1cr0mv182657n0rvdn041d4";
+          rev = "d67cee32231aee30984b9c5d0250d21b5377b620";
+          sha256 = "126q56673w7yz1p58550k6aya47nhbzn29g4zvq6wjbnicn0vwd1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -18472,12 +18430,12 @@
     inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-clojure";
-        version = "2.0.0";
+        version = "1.4.0";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "inf-clojure";
-          rev = "c797a5aea3d2126b19c48ed99aefe3ebddd5f304";
-          sha256 = "1m8bkh8mwl1zbvpgllrghpqr5m86lkwxn3jl3i0qd60arwy51iiy";
+          rev = "a9eb2109fcd547b5c9f18f7bf9e617f32d47b5a0";
+          sha256 = "1dmr1arqy2vs9jdjha513mvw3yfwgkn4zs728q83asjy91sfcz7k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -18912,12 +18870,12 @@
     ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "0.2.2";
+        version = "0.2.1";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "906c31b679a4a676fe593a9620fbfc3707afb616";
-          sha256 = "1sxz8cyr9i4nk5vrvf6qag8i7yrgqnxyhkilrqrmdyf6vw1vxgag";
+          rev = "9ee63f0415e9774082993d672d8200bc7e62d715";
+          sha256 = "0wrkpl6v56k553zzksy4rh6wkwxdp027x8n0byic9phydrnsdn57";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -20023,12 +19981,12 @@
     kivy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kivy-mode";
-        version = "1.10.0";
+        version = "1.9.1";
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "a4116a58d7c5448a4c6615021302375cbe3e129a";
-          sha256 = "070ybsn66spb82jp1fzrnkn6xlbn7jn8zprmxkz8jv0lf5lg6ggk";
+          rev = "7e789b24cdb0ee044469d7bc42da9e4146674a18";
+          sha256 = "0rzzjzkzgpiadm9awkj7wrh2hg97lhgwxg74gvdis3fc1xg2hyri";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -20107,12 +20065,12 @@
     kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "kubernetes";
-        version = "0.11.0";
+        version = "0.9.0";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "kubernetes-el";
-          rev = "1b70b632f0e8aa851c2a54f8b19881b4657b541d";
-          sha256 = "044864d12h7ddv42b8kmnppm2ccmxl1nzarbvgkszxgmg7f6c14z";
+          rev = "68dd3c2184e72b7a669e5706d1a3d95a220276d1";
+          sha256 = "163kx407jj08ifbpvvw1cp24qb4rm6l89ikgzqha01lc0bjglax5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes";
@@ -20128,12 +20086,12 @@
     kubernetes-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, kubernetes, lib, melpaBuild }:
     melpaBuild {
         pname = "kubernetes-evil";
-        version = "0.11.0";
+        version = "0.9.0";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "kubernetes-el";
-          rev = "1b70b632f0e8aa851c2a54f8b19881b4657b541d";
-          sha256 = "044864d12h7ddv42b8kmnppm2ccmxl1nzarbvgkszxgmg7f6c14z";
+          rev = "68dd3c2184e72b7a669e5706d1a3d95a220276d1";
+          sha256 = "163kx407jj08ifbpvvw1cp24qb4rm6l89ikgzqha01lc0bjglax5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes-evil";
@@ -20167,27 +20125,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    labburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "labburn-theme";
-        version = "1.0.0";
-        src = fetchFromGitHub {
-          owner = "ksjogo";
-          repo = "labburn-theme";
-          rev = "bfa1d9f1c7e107cb45754fe57e4e72a9be70e9d1";
-          sha256 = "1r221fwfigr6fk4p3xh00wgw9wxm2gpzvj17jf5pgd7cvyspchsy";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bfc9870fbe61f58f107b72fd7f16efba22c902/recipes/labburn-theme";
-          sha256 = "09qqb62hfga88zka0pc27rc8i43cxi84cv1x8wj0vvzx6mvic1lm";
-          name = "labburn-theme";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/labburn-theme";
-          license = lib.licenses.free;
-        };
-      }) {};
     langtool = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "langtool";
@@ -23211,22 +23148,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    neotree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "neotree";
-        version = "0.5.2";
+        version = "0.5.1";
         src = fetchFromGitHub {
           owner = "jaypei";
           repo = "emacs-neotree";
-          rev = "5e1271655170f4cdc6849258e383c548a4e6e3d0";
-          sha256 = "0hx72fq10772bbyqrj7mhhp02k26cccjxdadiqm1ykainhfmn1x0";
+          rev = "d2ae6ac8a919f164f34c589f2f46ddd140a79f81";
+          sha256 = "0xqcrxmpk2z4pd9scqn2nannqy0a76mkkqv9bz037a36w8v481nd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree";
           sha256 = "05smm1xsn866lsrak0inn2qw6dvzy24lz6h7rvinlhk5w27xva06";
           name = "neotree";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [];
         meta = {
           homepage = "https://melpa.org/#/neotree";
           license = lib.licenses.free;
@@ -23424,12 +23361,12 @@
     nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nord-theme";
-        version = "0.3.0";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "arcticicestudio";
           repo = "nord-emacs";
-          rev = "290aa9221a10e107acb0f06d0ec338fcb3e44785";
-          sha256 = "0az5l8y3jg6yk587wvgz1v5671d8p1vf9m0529x9axi1x7yzxry1";
+          rev = "a49113a0808ef53d066068e227d3d5a4d7f0ad44";
+          sha256 = "04jj25h1infivqdvcgq0cbc96y2rj2c23y6vw6yh73x4kyynzvcc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme";
@@ -24626,12 +24563,12 @@
     org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-mime";
-        version = "0.0.7";
+        version = "0.0.6";
         src = fetchFromGitHub {
           owner = "org-mime";
           repo = "org-mime";
-          rev = "dd1b9881af705b9e78f79791c9f933cabe59c125";
-          sha256 = "0ndyqz2hpvnx6kykjz4d8nmngdjfavlwchl2dasi6m98b585liqa";
+          rev = "d540da37df26c673b83cc9aab36f2ca6cfed3481";
+          sha256 = "0fcq75cjvd0fh7ic0j28ly40i95clgn5i7j1sj5infycqkrj87xc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
@@ -26815,12 +26752,12 @@
     plain-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "plain-theme";
-        version = "5";
+        version = "2";
         src = fetchFromGitHub {
           owner = "yegortimoshenko";
           repo = "plain-theme";
-          rev = "1e484668cf272ab1883cb3c1ad9e1e8639de395d";
-          sha256 = "0qhr8mch5fvy5gck5prradlrnx84h6n8nvrcqk6ynqd1nh0pnnzd";
+          rev = "43fc59d487d39e6110230a073f1376ab877aa739";
+          sha256 = "0g44qdpn3ni291awjklia4r26qyiavpjib04k761hfacrdkvsdys";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme";
@@ -26999,27 +26936,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    point-pos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "point-pos";
-        version = "0.1";
-        src = fetchFromGitHub {
-          owner = "alezost";
-          repo = "point-pos.el";
-          rev = "4cd0f8c8d1296c5c64f708b6a5835e8520c51b68";
-          sha256 = "1l3mlz51wp729rm6wf72x2fk1fla2n2s1qh8h8z58inipdi2qydp";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/23a1e835155fba51f595c10c46487a4c269f43ff/recipes/point-pos";
-          sha256 = "1zv6hx8i8jwq52j4la1ff0ar0bpbs2pb4gcsh9hypghba11gnync";
-          name = "point-pos";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/point-pos";
-          license = lib.licenses.free;
-        };
-      }) {};
     pony-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "pony-snippets";
@@ -29059,12 +28975,12 @@
     rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "rg";
-        version = "1.2.1";
+        version = "1.2.0";
         src = fetchFromGitHub {
           owner = "dajva";
           repo = "rg.el";
-          rev = "44eca47f049b25bd45e8cbc7e6579911e552b88a";
-          sha256 = "0riv5cr5sy37pcwvg0yjwi3qkvqr081503j487mcc7dcyvwlcrzy";
+          rev = "32fc22b192cbad03fca3835f29c36ab4a90e50a0";
+          sha256 = "168p4h7h9ik1f56cw0zr8brbn53d5jglv9r7i9zqh80zzhljw4xv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@@ -29710,12 +29626,12 @@
     sayid = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sayid";
-        version = "0.0.15";
+        version = "0.0.14";
         src = fetchFromGitHub {
           owner = "bpiel";
           repo = "sayid";
-          rev = "b44b6d346604f8d1ef9b9180be359ce1e601a298";
-          sha256 = "0ggk60l132qgscgqbx4fdhzx6nlv2k7gbrjapkdl15slz2kyq03d";
+          rev = "3e5456cade044f01eb0753aabc9e50868000bd14";
+          sha256 = "1asphbijh5y4ax03x1cn02l4ya8v44s23ani91a0d52msdaxbnyw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd2e05f9c9328d8f9ae434c86697a4a04af8b0d/recipes/sayid";
@@ -31304,12 +31220,12 @@
     spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spaceline }:
     melpaBuild {
         pname = "spaceline-all-the-icons";
-        version = "1.1.1";
+        version = "1.0.7";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "spaceline-all-the-icons.el";
-          rev = "481329d1d1c4c505a91b7f2ac231f77a19e2c74d";
-          sha256 = "15snhm5rq0n31g9hk5gzimhjclfll67vi7avhrhd9z9x6dvq0sp4";
+          rev = "8915d284fc0b5fb83c9d6300750a40ef4ac05eae";
+          sha256 = "0fhni6lxs6pa8hgq16mapsxbyiqd74x9d0hhml77lanwgyy3fxnk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
@@ -32578,22 +32494,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
+    telephone-line = callPackage ({ cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "telephone-line";
-        version = "0.4";
+        version = "0.3";
         src = fetchFromGitHub {
           owner = "dbordak";
           repo = "telephone-line";
-          rev = "a83dcda21b0f6e10e51c3cded7da9a5d2ead5f34";
-          sha256 = "1cg34l6jq75mcqnb3p93z0kv1arvnswm8nkk39fmryand2yygnl9";
+          rev = "70c113bea37719c83961023afd893044398e681d";
+          sha256 = "0smdlzrcbmip6c6c3rd0871wv5xyagavwsxhhgvki6ybyzdj9a19";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line";
           sha256 = "0dyh9h1yk9y0217b6rxsm7m372n910vpfgw5w23lkkrwa8x8qpx3";
           name = "telephone-line";
         };
-        packageRequires = [ cl-generic cl-lib emacs seq ];
+        packageRequires = [ cl-lib eieio emacs s seq ];
         meta = {
           homepage = "https://melpa.org/#/telephone-line";
           license = lib.licenses.free;
@@ -33417,27 +33333,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    turing-machine = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "turing-machine";
-        version = "0.1.2";
-        src = fetchFromGitHub {
-          owner = "therockmandolinist";
-          repo = "turing-machine";
-          rev = "41e367e54fbeff572f599f2f321ffc863601484e";
-          sha256 = "0qlm7y3pm8sfy36a8jc3cr955hqsmypzshbgxfnmcmz7wl96dplh";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a003b40a52a92b3ab4d1ffc003f570d4fa6bfbde/recipes/turing-machine";
-          sha256 = "1ndy953q9hr1psqqkkqsffyvj800cnqdxcrixqiw0ls77f2kczcn";
-          name = "turing-machine";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/turing-machine";
-          license = lib.licenses.free;
-        };
-      }) {};
     twilight-anti-bright-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "twilight-anti-bright-theme";
@@ -33609,12 +33504,12 @@
     undercover = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, shut-up }:
     melpaBuild {
         pname = "undercover";
-        version = "0.6.1";
+        version = "0.6.0";
         src = fetchFromGitHub {
           owner = "sviridov";
           repo = "undercover.el";
-          rev = "86f856c799aacfd48d2eb42d1a6afda0e6e49845";
-          sha256 = "080bmfwyfi8663y8x594770hqz7mff7zvj2v03qdfwbhdr9w9y29";
+          rev = "e72b8c924272f65d7cc6e884478e26d0b1e1e4e8";
+          sha256 = "06qcvbp5rd0kh3ibrxj5p6r578lwsrgd7yj5c6slwmkdmna2fj33";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d58ad9eb863494f609114e3c6af8c14c891b83a5/recipes/undercover";
@@ -34161,12 +34056,12 @@
     visual-fill-column = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "visual-fill-column";
-        version = "1.11";
+        version = "1.10";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "visual-fill-column";
-          rev = "57c2a72d46900117ea92e0a01b97e19481800503";
-          sha256 = "086zfx4lh168rg50ndg8qzdh8vzc6sgfii7qzcn4mg4wa74hnp9y";
+          rev = "159dcee48e7311ee816686d62e7ce36619127462";
+          sha256 = "0bij20a8f9pd4307m2qslcx8p3j59hkr14sm18aw0bric65him8b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7628c805840c4687686d0b9dc5007342864721e/recipes/visual-fill-column";
@@ -34518,12 +34413,12 @@
     webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, request }:
     melpaBuild {
         pname = "webpaste";
-        version = "1.3.0";
+        version = "1.2.2";
         src = fetchFromGitHub {
           owner = "etu";
           repo = "webpaste.el";
-          rev = "70e8fd064184632b0363572b74647c7250d6eb1b";
-          sha256 = "1zlc65c0wnp8wgnpn9f60bxm4p2g46h1s2dpqm6rrvb7yp0diml3";
+          rev = "72ba31e5acb424cc3f87fb9c05233729722ef98e";
+          sha256 = "07bc62ymhx2kvnqi433w2nwnhqz18x6wdp1l1jqhljbr5xk39pn2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@@ -35632,8 +35527,8 @@
         version = "1.78";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "428584533eab";
-          sha256 = "1nrvlziqfsyvsk09ynpww99z4vb8zv8h2jxsslvx1nm1shyn2ckh";
+          rev = "7bf780961390";
+          sha256 = "19nxjabwr3c5sjii2pwlgak751wq9h12yp7xd6nz8i6f75md59xs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
@@ -35806,12 +35701,12 @@
     zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "zerodark-theme";
-        version = "4.4";
+        version = "4.2";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "zerodark-theme";
-          rev = "60615d101769694038b17a2c75bb31c26f36a042";
-          sha256 = "09fpyhprmavv1fa97wa7lf182nhiw0797rh73xbhf7xhn1c22gbj";
+          rev = "af231794425255d436690c9c31bceb2052251210";
+          sha256 = "1xnhcxf5d0gn8lhapjg7b289bqpf8w0d2mp76ksb8rsvx4r0bdbw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";
diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index 83f5208e81e..0e3d3fea328 100644
--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/org-generated.nix
@@ -1,10 +1,10 @@
 { callPackage }: {
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20170502";
+        version = "20170210";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20170502.tar";
-          sha256 = "1y5rdf6740z45v75y17yh3a1ivdk5fjrax3hyr11jydyicczk4h1";
+          url = "http://orgmode.org/elpa/org-20170210.tar";
+          sha256 = "1v8adjz3rv429is8m7xx2v8hvc20dxl4hcdhdf2vhcx44bgbvyjb";
         };
         packageRequires = [];
         meta = {
@@ -14,10 +14,10 @@
       }) {};
     org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org-plus-contrib";
-        version = "20170502";
+        version = "20170210";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20170502.tar";
-          sha256 = "06pr3w11zpns66km27ql3w8qlk6bxaxqx3bmaiwrxykhbf74dib0";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20170210.tar";
+          sha256 = "1h0lwf1sw7n1df865ip5mp0pdmdi2md6hz6fq53r4zhali041ifx";
         };
         packageRequires = [];
         meta = {

From d80d08de50eab6de27013da4a82b1d7f21ebea60 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@tjaldur.nl>
Date: Wed, 10 May 2017 18:29:07 +0200
Subject: [PATCH 34/84] lzip: 1.18 -> 1.19

---
 pkgs/tools/compression/lzip/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix
index 36014fdd0ad..17bc24ab599 100644
--- a/pkgs/tools/compression/lzip/default.nix
+++ b/pkgs/tools/compression/lzip/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "lzip-${version}";
-  version = "1.18";
+  version = "1.19";
 
   buildInputs = [ texinfo ];
 
   src = fetchurl {
     url = "mirror://savannah/lzip/${name}.tar.gz";
-    sha256 = "1p8lvc22sv3damld9ng8y6i8z2dvvpsbi9v7yhr5bc2a20m8iya7";
+    sha256 = "1abbch762gv8rjr579q3qyyk6c80plklbv2mw4x0vg71dgsw9bgz";
   };
 
   configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3";

From cb1af17f53fbd0971e923bd90604159aa694057c Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 10 May 2017 17:52:34 +0000
Subject: [PATCH 35/84] zstd: 1.1.3 -> 1.2.0

---
 pkgs/tools/compression/zstd/default.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index dba6e6fc337..82ead0baa16 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchFromGitHub
+{ stdenv, fetchFromGitHub, gnugrep
 , legacySupport ? false }:
 
 stdenv.mkDerivation rec {
   name = "zstd-${version}";
-  version = "1.1.3";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
-    sha256 = "1d46hs6pyq55izcmnk7hzvbl8iyxh7bp7qchc7rl8ay396ax2sd5";
+    sha256 = "01b5w4yrwa8lgnjyi42zxjhw8cfyh8yfhdsjr04y5qsblz0hv0zl";
     rev = "v${version}";
     repo = "zstd";
     owner = "facebook";
@@ -24,6 +24,15 @@ stdenv.mkDerivation rec {
     "PREFIX=$(out)"
   ];
 
+  preInstall = ''
+    substituteInPlace programs/zstdgrep \
+      --replace "=grep" "=${gnugrep}/bin/grep" \
+      --replace "=zstdcat" "=$out/bin/zstdcat"
+
+    substituteInPlace programs/zstdless \
+      --replace "zstdcat" "$out/bin/zstdcat"
+  '';
+
   meta = with stdenv.lib; {
     description = "Zstandard real-time compression algorithm";
     longDescription = ''
@@ -40,6 +49,6 @@ stdenv.mkDerivation rec {
     license = with licenses; [ gpl2Plus bsd2 ];
 
     platforms = platforms.unix;
-    maintainers = with maintainers; [ nckx ];
+    maintainers = with maintainers; [ nckx orivej ];
   };
 }

From 0157ffe0a3a99d9e8d81bd2dbbb809c05f0773df Mon Sep 17 00:00:00 2001
From: Balletie <skip_meesie@hotmail.com>
Date: Wed, 10 May 2017 21:25:26 +0200
Subject: [PATCH 36/84] emojione: Fix typo in meta.license attribute name

When installing this package, it broke because there was no
meta.license attribute.
---
 pkgs/data/fonts/emojione/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix
index e19734c1913..d0bf8d34714 100644
--- a/pkgs/data/fonts/emojione/default.nix
+++ b/pkgs/data/fonts/emojione/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Open source emoji set";
     homepage = "http://emojione.com/";
-    licenses = licenses.cc-by-40;
+    license = licenses.cc-by-40;
     platforms = platforms.all;
     maintainers = with maintainers; [ abbradar ];
   };

From 33acfb8029ae9881aa15a839b7e72be4460bddc2 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Wed, 10 May 2017 15:56:45 -0400
Subject: [PATCH 37/84] cmark: 0.23.0 -> 0.27.1

---
 pkgs/development/libraries/cmark/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix
index 303a6ccaeb8..dceb042732d 100644
--- a/pkgs/development/libraries/cmark/default.nix
+++ b/pkgs/development/libraries/cmark/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-  version = "0.23.0";
+  version = "0.27.1";
   name = "cmark-${version}";
 
   src = fetchurl {
     url = "https://github.com/jgm/cmark/archive/${version}.tar.gz";
-    sha256 = "87d289965066fce7be247d44c0304af1b20817dcc1b563702302ae33f2be0596";
+    sha256 = "1da62ispca9aal2a36gaj87175rv5013pl7x740vk32y6lclr6v6";
   };
 
   buildInputs = [ cmake ];

From dd70ff228f7081d9152842feac1954636656edc8 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 10 May 2017 22:50:58 +0200
Subject: [PATCH 38/84] svtplay-dl: 1.9.3 -> 1.9.4

---
 pkgs/tools/misc/svtplay-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index 8d65f253c9b..a652243a9d6 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -5,13 +5,13 @@ let
   inherit (pythonPackages) python nose pycrypto requests mock;
 in stdenv.mkDerivation rec {
   name = "svtplay-dl-${version}";
-  version = "1.9.3";
+  version = "1.9.4";
 
   src = fetchFromGitHub {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    sha256 = "14qksi1svi89niffykxg47kay013byls6bnhkrkzkanq04075lmw";
+    sha256 = "15vjaia1qbs49gplpfi8sj5scl9mb4qg8n2z4zyzjs5461lx5qqv";
   };
 
   pythonPaths = [ pycrypto requests ];

From 6fedc9cdbeea0f7315fcd143b28b199d3bddd1d4 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Wed, 10 May 2017 23:18:48 +0200
Subject: [PATCH 39/84] {lib}mediainfo{-gui}: 0.7.91 -> 0.7.95

---
 pkgs/applications/misc/mediainfo-gui/default.nix    | 4 ++--
 pkgs/applications/misc/mediainfo/default.nix        | 4 ++--
 pkgs/development/libraries/libmediainfo/default.nix | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index e60d1619685..5d7a89060fa 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -2,11 +2,11 @@
 , desktop_file_utils, libSM, imagemagick }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.91";
+  version = "0.7.95";
   name = "mediainfo-gui-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "15jrph9hjza4c87m739s7c9v27gji94ha7rpchb8li0rcdvy40dm";
+    sha256 = "0bil5hsjas585s83j0srxwlplzpw2wny2wklp8az8iayvxmmi20m";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index 0ddee228e9d..a2c52181757 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.91";
+  version = "0.7.95";
   name = "mediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "15jrph9hjza4c87m739s7c9v27gji94ha7rpchb8li0rcdvy40dm";
+    sha256 = "0bil5hsjas585s83j0srxwlplzpw2wny2wklp8az8iayvxmmi20m";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index f57a49ab812..09b829695c4 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.91";
+  version = "0.7.95";
   name = "libmediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
-    sha256 = "1h39cwd85rgidr0hbwab9dwbjv25xhvjv8y2nv35p3fwrs48p098";
+    sha256 = "0snrcashc5c5gcwvfh7sl7z4h523d8vxbfin3gb6g81zv43d2b23";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From f8ff43190b0e8a6caaa8fece0257a9f8fd102875 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 10 May 2017 19:42:15 -0400
Subject: [PATCH 40/84] org-packages: 2017-05-10

---
 .../editors/emacs-modes/org-generated.nix            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index 0e3d3fea328..83f5208e81e 100644
--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/org-generated.nix
@@ -1,10 +1,10 @@
 { callPackage }: {
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20170210";
+        version = "20170502";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20170210.tar";
-          sha256 = "1v8adjz3rv429is8m7xx2v8hvc20dxl4hcdhdf2vhcx44bgbvyjb";
+          url = "http://orgmode.org/elpa/org-20170502.tar";
+          sha256 = "1y5rdf6740z45v75y17yh3a1ivdk5fjrax3hyr11jydyicczk4h1";
         };
         packageRequires = [];
         meta = {
@@ -14,10 +14,10 @@
       }) {};
     org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org-plus-contrib";
-        version = "20170210";
+        version = "20170502";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20170210.tar";
-          sha256 = "1h0lwf1sw7n1df865ip5mp0pdmdi2md6hz6fq53r4zhali041ifx";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20170502.tar";
+          sha256 = "06pr3w11zpns66km27ql3w8qlk6bxaxqx3bmaiwrxykhbf74dib0";
         };
         packageRequires = [];
         meta = {

From ab663fee1523cbc99a44bde6997314e2c59664aa Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 10 May 2017 19:41:57 -0400
Subject: [PATCH 41/84] elpa-packages: 2017-05-10

---
 .../editors/emacs-modes/elpa-generated.nix     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index ce9efbcca8c..c69d4c2786f 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -54,10 +54,10 @@
       }) {};
     adaptive-wrap = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "adaptive-wrap";
-        version = "0.5";
+        version = "0.5.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/adaptive-wrap-0.5.el";
-          sha256 = "0frgmp8vrrml4iykm60j4d6cl9rbcivy9yh24q6kd10bcyx59ypy";
+          url = "https://elpa.gnu.org/packages/adaptive-wrap-0.5.1.el";
+          sha256 = "0qi7gjprcpywk2daivnlavwsx53hl5wcqvpxbwinvigg42vxh3ll";
         };
         packageRequires = [];
         meta = {
@@ -737,10 +737,10 @@
       }) {};
     exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild {
         pname = "exwm";
-        version = "0.13";
+        version = "0.14";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/exwm-0.13.tar";
-          sha256 = "0n1wzy6chh024r0yaywjbf7mdsrxs6hrfycv5v0ps0drf6q3zldc";
+          url = "https://elpa.gnu.org/packages/exwm-0.14.tar";
+          sha256 = "14hjjpbasm84p54fxy73fg7g1fdwqkvisdw8dwwgzkflmd647mkx";
         };
         packageRequires = [ xelb ];
         meta = {
@@ -1663,10 +1663,10 @@
       }) {};
     seq = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "seq";
-        version = "2.19";
+        version = "2.20";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/seq-2.19.tar";
-          sha256 = "11hb7is6a4h1lscjcfrzh576j0g3m5yjydn16s6x5bxp5gsr6zha";
+          url = "https://elpa.gnu.org/packages/seq-2.20.tar";
+          sha256 = "0vrpx6nnyjb0gsypknzagimlhvcvi5y1rcdkpxyqr42415zr8d0n";
         };
         packageRequires = [];
         meta = {

From 580a4e60031e2a7000e44c70ad802c1092cf204f Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 10 May 2017 19:43:09 -0400
Subject: [PATCH 42/84] melpa-stable-packages: 2017-05-10

---
 .../emacs-modes/melpa-stable-generated.nix    | 370 ++++++++++++------
 1 file changed, 248 insertions(+), 122 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 8f3dd9a313b..83d9a0b899c 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -1154,27 +1154,48 @@
           license = lib.licenses.free;
         };
       }) {};
-    all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
+    all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }:
     melpaBuild {
         pname = "all-the-icons";
-        version = "2.5.2";
+        version = "2.6.2";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "all-the-icons.el";
-          rev = "0ed04c0cdf10ce43a01323ac97f129520de09a7e";
-          sha256 = "0h7h0rbd34g5yrm4f1bpdwkw3yrj2w75jzgh2blrdhbs29sxdv1s";
+          rev = "f21e1004e0e115a73e503b92e8a4faf656fa413a";
+          sha256 = "022pk57dszg253bk7q5p0sp91ihc7dnyvky49b73gwcm77jgrjzd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
           sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q";
           name = "all-the-icons";
         };
-        packageRequires = [ emacs font-lock-plus ];
+        packageRequires = [ emacs font-lock-plus memoize ];
         meta = {
           homepage = "https://melpa.org/#/all-the-icons";
           license = lib.licenses.free;
         };
       }) {};
+    all-the-icons-ivy = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "all-the-icons-ivy";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "asok";
+          repo = "all-the-icons-ivy";
+          rev = "aa791d6b0055bce3ac68970a8ef6abf0726edf0f";
+          sha256 = "0mmimibzn5ncy4rpyq6vkk2m2qlki54nf8yirphabh4m2zf9marg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9496e6bb6f03f35444fb204860bc50e5e1b36214/recipes/all-the-icons-ivy";
+          sha256 = "1xv67gxd2sqj6zld4i3qcid0x5qsbd7baz55m93y1ivdqi7x7gr2";
+          name = "all-the-icons-ivy";
+        };
+        packageRequires = [ all-the-icons emacs ivy ];
+        meta = {
+          homepage = "https://melpa.org/#/all-the-icons-ivy";
+          license = lib.licenses.free;
+        };
+      }) {};
     amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }:
     melpaBuild {
         pname = "amd-mode";
@@ -1645,6 +1666,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "apiwrap";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "vermiculus";
+          repo = "apiwrap.el";
+          rev = "2feb4a9c58a105867197f92c0b27f1de8d213f45";
+          sha256 = "0yyl2zn02mnhpg6xfcywypg3yprabgkzi9spr407nia86ljrqqss";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap";
+          sha256 = "0n50n1n5pvcgcp1gmna3ci36pnbanjdbjpgv7zyarlb80hywbiyw";
+          name = "apiwrap";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/apiwrap";
+          license = lib.licenses.free;
+        };
+      }) {};
     apples-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apples-mode";
@@ -4332,12 +4374,12 @@
     cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cmake-mode";
-        version = "3.8.0";
+        version = "3.8.1";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "da7833c5bb1f331162d46a2c664a443c1c641089";
-          sha256 = "0ca99p3i0q0f313yzfzd62pc4gl385lr1rfsx4z5vlr24ap7ipzy";
+          rev = "8bd6af0d6386d1e0b26ff594b7d42621d67b5985";
+          sha256 = "10rij858aq3hdkdpackhmpmqj3zlfahc3jbfjffk2yicnwmnkb6s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -7049,22 +7091,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
+    doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "1.1.5";
+        version = "1.2.5";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-theme";
-          rev = "f07088c1a6c177cdb5e2ff674489c17a8a7a8426";
-          sha256 = "1c6id6d42p38viwd0x6cic0v08g117gj7im1m15k9j52rkvgvvn8";
+          rev = "d04875c9c7ce21d5f51dfc541a5d03efddac7728";
+          sha256 = "0lfldrsfldrnw9g59dnsmyyp7j3v3kqv0d39h4kzs9dhm5v9dpbr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes";
           sha256 = "1ckr8rv1i101kynnx666lm7qa73jf9i5lppgwmhlc76lisg07cik";
           name = "doom-themes";
         };
-        packageRequires = [ all-the-icons dash emacs font-lock-plus ];
+        packageRequires = [ all-the-icons cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/doom-themes";
           license = lib.licenses.free;
@@ -8435,12 +8477,12 @@
     elpa-clone = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elpa-clone";
-        version = "0.0.5";
+        version = "0.0.6";
         src = fetchFromGitHub {
           owner = "dochang";
           repo = "elpa-clone";
-          rev = "144bee09445b30cbf4f60b371a289f0d75a387aa";
-          sha256 = "1k80y3wcqvhdbc0w5ybicn2hqjldp7b4jwraca2b99676c0yiq25";
+          rev = "92f4c9d3570ad002575a90d0cc4a522c203a1110";
+          sha256 = "0m5w5wgyslvakcqpr3d198sy3561w2h002gflw0jp47v17hba1r7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/11861edd9c7f9deebd44fd1f8ef648e7a04caf2b/recipes/elpa-clone";
@@ -8840,11 +8882,11 @@
       }) {};
     emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "emms";
-        version = "4.2";
+        version = "4.3";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/emms.git";
-          rev = "6736d2e86d2909ef44759b1162e006bd5cc07547";
-          sha256 = "1qxdxy2grh0fdx50w1m9rmpvygxcywis4qjzi0mrpv2i7rwn8qal";
+          rev = "4cb3ae341847e8e8586373a95a458a453469812d";
+          sha256 = "0bmxlrk2p51bw5lgh2arkcz1v9bw6rpflwk778rdzn0rhzhvhp5b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
@@ -9420,22 +9462,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "19.3.2";
+        version = "20.0pre1";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "6acb7d6fb8d23c0b0b78d30a618d2636ad463e6e";
-          sha256 = "1a3yk18sr3y524jl8icp8qh5j143ykxs51xdwz2bzxac2y78k0xk";
+          rev = "4f03eba5294f1c1bc922b07f1267e6b0099fd4b5";
+          sha256 = "0ryi6r4ahh5dsl04nqgqhzymzm9krxr0kf4r3v3xg1yzw6d4g2a8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
           sha256 = "1cs768xxbyrr78ln50k4yknmpbcc1iplws3k07r0gx5f3ca73iaq";
           name = "erlang";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/erlang";
           license = lib.licenses.free;
@@ -9863,12 +9905,12 @@
     ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ethan-wspace";
-        version = "0.7.0";
+        version = "0.7.1";
         src = fetchFromGitHub {
           owner = "glasserc";
           repo = "ethan-wspace";
-          rev = "b8eae49ed3e7f646c16234970af5663e3090e720";
-          sha256 = "1xqc4lqzirpmr21w766g8vmcvvsq8b3hv9i7r27i5x1g0j4jabja";
+          rev = "e055ee6730c0b03525d32e67511ef6c51e4c29e4";
+          sha256 = "0ik3y60xd3ap1pg5dr5ab6bq4qh8gblpgz1iiprmv7acr3ckzc41";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9454f3a58e3416fa60d8411b0db19c408935408f/recipes/ethan-wspace";
@@ -10828,12 +10870,12 @@
     eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eziam-theme";
-        version = "0.4";
+        version = "0.4.1";
         src = fetchFromGitHub {
           owner = "thblt";
           repo = "eziam-theme-emacs";
-          rev = "3e888e489774e1f6e5ce15fda46296d2fee0de1f";
-          sha256 = "1rxyah6xcdjf3zx1b0gn56wi6gsk95ifsarca67ir3lc1797ldwk";
+          rev = "df2ae56e1ee5cc41c335ca6fd7ead3b99b3c5edd";
+          sha256 = "0nsch4zzqd64rq0y75knfp95nn5nq2hvvgcjhq0i075g2vwhf73w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
@@ -11122,12 +11164,12 @@
     find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "find-file-in-project";
-        version = "5.2.7";
+        version = "5.3.0";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "1ac2c0a717a1a0b70839625f2aaad2c18c21f729";
-          sha256 = "0vmigmbr4fc36sahpf0bj65isa4sf1xhn1v2qvnidbx8qg18hm2f";
+          rev = "9416c3db483dc86530a204f5ae1b587c5c3c8cec";
+          sha256 = "16mwa3si70z2q8g859vbc0al3h8mjig8z6m3l7a0lrx373mp205j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -12848,6 +12890,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    free-keys = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "free-keys";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "free-keys";
+          rev = "edfd69dc369b2647447b7c28c7c1163b1ddf45b4";
+          sha256 = "0xgifa7s9n882f9ymyyz9gc11xfbj3vfpnxiq1fqfm5hmwx9pwbc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/55067e899ba618d4394ad9657322c92a667a0774/recipes/free-keys";
+          sha256 = "0j9cfgy2nkbska4lm5z32p804i9n8pdgn50bs5zzk1ilwd5vbalj";
+          name = "free-keys";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/free-keys";
+          license = lib.licenses.free;
+        };
+      }) {};
     fringe-helper = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fringe-helper";
@@ -13550,12 +13613,12 @@
     git-commit-insert-issue = callPackage ({ bitbucket, fetchFromGitLab, fetchurl, github-issues, gitlab, helm, lib, melpaBuild, projectile, s }:
     melpaBuild {
         pname = "git-commit-insert-issue";
-        version = "0.3";
+        version = "0.3.1";
         src = fetchFromGitLab {
           owner = "emacs-stuff";
           repo = "git-commit-insert-issue";
-          rev = "7ee9dc88acc1e766700a6170a2ba6b0b853220db";
-          sha256 = "1fi0gy0093dwdcsl7ikzdjxklqrf1p6f99bpxi4xzk2waca70klf";
+          rev = "5f08c17bf93b17915415d435ee41923d924fe20b";
+          sha256 = "11my5apnyhdqh0pmq9wdjd1iah415a5nw87sk586cb3vxnbn5qas";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/git-commit-insert-issue";
@@ -14684,12 +14747,12 @@
     grails-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "grails-mode";
-        version = "1.0.1";
+        version = "1.0.2";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "50801257d376fd7383ddf9c19ff567183c24ad0b";
-          sha256 = "0wy8iw12b9bs7xza8jjnjvggr59rgbsgn1kk2g0pj0nppvfdrvjm";
+          rev = "f8e9628916d4d41e1816b53d02f0b5a00c499555";
+          sha256 = "1myb15n207yl2cgacmn105r1xbjq076paq6anvw53smy3fhw9sh9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -14846,8 +14909,8 @@
         version = "0.1";
         src = fetchhg {
           url = "https://bitbucket.com/tws/grass-mode.el";
-          rev = "5383fff2996b";
-          sha256 = "1igbdrs14dmaa5mbhq3jnrkq16nndingflpnwxi921dag613c3jz";
+          rev = "1ae8eae88117";
+          sha256 = "1sl3d5759fjm98pb50ykz2c05czb2298ipccwj2qz2hdzq63hfv8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grass-mode";
@@ -14945,12 +15008,12 @@
     groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "groovy-mode";
-        version = "1.0.1";
+        version = "1.0.2";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "50801257d376fd7383ddf9c19ff567183c24ad0b";
-          sha256 = "0wy8iw12b9bs7xza8jjnjvggr59rgbsgn1kk2g0pj0nppvfdrvjm";
+          rev = "f8e9628916d4d41e1816b53d02f0b5a00c499555";
+          sha256 = "1myb15n207yl2cgacmn105r1xbjq076paq6anvw53smy3fhw9sh9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -15092,12 +15155,12 @@
     guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "guix";
-        version = "0.3";
+        version = "0.3.1";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "9cc6dba6ac9ede2855a1a95a22bc7353949f4362";
-          sha256 = "0yyq2z3vsgib9r8paaj7ls4f8rwxmnhi5jsydzdmwqw1hrpkclv9";
+          rev = "35c1506bec0cb43629d30cae8be6cd7f793fff8b";
+          sha256 = "1dlh4ppnbliv2ipfysdrnpix5kg6nwjc0468whi3w758nwpkamzc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -15511,12 +15574,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "2.6.1";
+        version = "2.7.0";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "9db9ed21c8d6454c60eb50c7cc935540d31abc43";
-          sha256 = "1vanva75xv52yg68mqcbxvdbrkq66qb883sjvg3fsg4slwivbiz6";
+          rev = "bdc6711656954562ed721545ac22ee3a507110a3";
+          sha256 = "1zx41nwfpzc0zrzi3bm6pmja0rl1jl3brbybiww4f4kqh34d0ddj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -15826,12 +15889,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "2.6.1";
+        version = "2.7.0";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "9db9ed21c8d6454c60eb50c7cc935540d31abc43";
-          sha256 = "1vanva75xv52yg68mqcbxvdbrkq66qb883sjvg3fsg4slwivbiz6";
+          rev = "bdc6711656954562ed721545ac22ee3a507110a3";
+          sha256 = "1zx41nwfpzc0zrzi3bm6pmja0rl1jl3brbybiww4f4kqh34d0ddj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -17254,12 +17317,12 @@
     hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hindent";
-        version = "5.2.2";
+        version = "5.2.3";
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "hindent";
-          rev = "d67cee32231aee30984b9c5d0250d21b5377b620";
-          sha256 = "126q56673w7yz1p58550k6aya47nhbzn29g4zvq6wjbnicn0vwd1";
+          rev = "abe2933e3d1f82e4eecfba11ffed27f7f52ca469";
+          sha256 = "12f1mmkapjf5l6ka3k09s4i3qg5pk1cr0mv182657n0rvdn041d4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -18430,12 +18493,12 @@
     inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-clojure";
-        version = "1.4.0";
+        version = "2.0.0";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "inf-clojure";
-          rev = "a9eb2109fcd547b5c9f18f7bf9e617f32d47b5a0";
-          sha256 = "1dmr1arqy2vs9jdjha513mvw3yfwgkn4zs728q83asjy91sfcz7k";
+          rev = "c797a5aea3d2126b19c48ed99aefe3ebddd5f304";
+          sha256 = "1m8bkh8mwl1zbvpgllrghpqr5m86lkwxn3jl3i0qd60arwy51iiy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -18870,12 +18933,12 @@
     ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "0.2.1";
+        version = "0.2.2";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "9ee63f0415e9774082993d672d8200bc7e62d715";
-          sha256 = "0wrkpl6v56k553zzksy4rh6wkwxdp027x8n0byic9phydrnsdn57";
+          rev = "906c31b679a4a676fe593a9620fbfc3707afb616";
+          sha256 = "1sxz8cyr9i4nk5vrvf6qag8i7yrgqnxyhkilrqrmdyf6vw1vxgag";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -19981,12 +20044,12 @@
     kivy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kivy-mode";
-        version = "1.9.1";
+        version = "1.10.0";
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "7e789b24cdb0ee044469d7bc42da9e4146674a18";
-          sha256 = "0rzzjzkzgpiadm9awkj7wrh2hg97lhgwxg74gvdis3fc1xg2hyri";
+          rev = "a4116a58d7c5448a4c6615021302375cbe3e129a";
+          sha256 = "070ybsn66spb82jp1fzrnkn6xlbn7jn8zprmxkz8jv0lf5lg6ggk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -20065,12 +20128,12 @@
     kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "kubernetes";
-        version = "0.9.0";
+        version = "0.11.0";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "kubernetes-el";
-          rev = "68dd3c2184e72b7a669e5706d1a3d95a220276d1";
-          sha256 = "163kx407jj08ifbpvvw1cp24qb4rm6l89ikgzqha01lc0bjglax5";
+          rev = "1b70b632f0e8aa851c2a54f8b19881b4657b541d";
+          sha256 = "044864d12h7ddv42b8kmnppm2ccmxl1nzarbvgkszxgmg7f6c14z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes";
@@ -20086,12 +20149,12 @@
     kubernetes-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, kubernetes, lib, melpaBuild }:
     melpaBuild {
         pname = "kubernetes-evil";
-        version = "0.9.0";
+        version = "0.11.0";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "kubernetes-el";
-          rev = "68dd3c2184e72b7a669e5706d1a3d95a220276d1";
-          sha256 = "163kx407jj08ifbpvvw1cp24qb4rm6l89ikgzqha01lc0bjglax5";
+          rev = "1b70b632f0e8aa851c2a54f8b19881b4657b541d";
+          sha256 = "044864d12h7ddv42b8kmnppm2ccmxl1nzarbvgkszxgmg7f6c14z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes-evil";
@@ -20125,6 +20188,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    labburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "labburn-theme";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "ksjogo";
+          repo = "labburn-theme";
+          rev = "bfa1d9f1c7e107cb45754fe57e4e72a9be70e9d1";
+          sha256 = "1r221fwfigr6fk4p3xh00wgw9wxm2gpzvj17jf5pgd7cvyspchsy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bfc9870fbe61f58f107b72fd7f16efba22c902/recipes/labburn-theme";
+          sha256 = "09qqb62hfga88zka0pc27rc8i43cxi84cv1x8wj0vvzx6mvic1lm";
+          name = "labburn-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/labburn-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     langtool = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "langtool";
@@ -23148,22 +23232,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    neotree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "neotree";
-        version = "0.5.1";
+        version = "0.5.2";
         src = fetchFromGitHub {
           owner = "jaypei";
           repo = "emacs-neotree";
-          rev = "d2ae6ac8a919f164f34c589f2f46ddd140a79f81";
-          sha256 = "0xqcrxmpk2z4pd9scqn2nannqy0a76mkkqv9bz037a36w8v481nd";
+          rev = "5e1271655170f4cdc6849258e383c548a4e6e3d0";
+          sha256 = "0hx72fq10772bbyqrj7mhhp02k26cccjxdadiqm1ykainhfmn1x0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree";
           sha256 = "05smm1xsn866lsrak0inn2qw6dvzy24lz6h7rvinlhk5w27xva06";
           name = "neotree";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "https://melpa.org/#/neotree";
           license = lib.licenses.free;
@@ -23361,12 +23445,12 @@
     nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nord-theme";
-        version = "0.2.0";
+        version = "0.3.0";
         src = fetchFromGitHub {
           owner = "arcticicestudio";
           repo = "nord-emacs";
-          rev = "a49113a0808ef53d066068e227d3d5a4d7f0ad44";
-          sha256 = "04jj25h1infivqdvcgq0cbc96y2rj2c23y6vw6yh73x4kyynzvcc";
+          rev = "290aa9221a10e107acb0f06d0ec338fcb3e44785";
+          sha256 = "0az5l8y3jg6yk587wvgz1v5671d8p1vf9m0529x9axi1x7yzxry1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme";
@@ -23984,15 +24068,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild, popup, s, shut-up }:
+    omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }:
     melpaBuild {
         pname = "omnisharp";
         version = "3.9";
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "93c188938305533ea34ceca51dd53c7841598ada";
-          sha256 = "0ynjxf0r9i5yb98pnhrcm55shhv4gqfr0wigfkz83yqzpsjzq6fn";
+          rev = "59aa5ac1957b4875e13f52885255293608a960f4";
+          sha256 = "1jjhksrp3ljl4pqkclyvdwbj0dzn1alnxdz42f4xmlx4kn93w8bs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp";
@@ -24004,8 +24088,8 @@
           cl-lib
           csharp-mode
           dash
+          emacs
           flycheck
-          json
           popup
           s
           shut-up
@@ -24204,22 +24288,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-babel-eval-in-repl = callPackage ({ emacs, eval-in-repl, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    org-babel-eval-in-repl = callPackage ({ emacs, ess, eval-in-repl, fetchFromGitHub, fetchurl, lib, matlab-mode, melpaBuild }:
     melpaBuild {
         pname = "org-babel-eval-in-repl";
-        version = "1.0";
+        version = "1.4";
         src = fetchFromGitHub {
           owner = "diadochos";
           repo = "org-babel-eval-in-repl";
-          rev = "1e3189e2da14c1c2a2b793c6563597c1aa7d1122";
-          sha256 = "0vf77wc1pq9dfqkrnagkxfg7klwyaichms492jsp0dh5warnw7hm";
+          rev = "38d02b8e2412381f6498c29511d1981a88b7d7f4";
+          sha256 = "0fwmcignkglx73spk3cv7acap15yrn0c0npr4ikfc9prs6svaah6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-babel-eval-in-repl";
           sha256 = "0brqp0w9s28ibws4idlm1rw09lsfa98l5wbpwm64rvlixhs6zlnx";
           name = "org-babel-eval-in-repl";
         };
-        packageRequires = [ emacs eval-in-repl ];
+        packageRequires = [ emacs ess eval-in-repl matlab-mode ];
         meta = {
           homepage = "https://melpa.org/#/org-babel-eval-in-repl";
           license = lib.licenses.free;
@@ -24563,12 +24647,12 @@
     org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-mime";
-        version = "0.0.6";
+        version = "0.0.7";
         src = fetchFromGitHub {
           owner = "org-mime";
           repo = "org-mime";
-          rev = "d540da37df26c673b83cc9aab36f2ca6cfed3481";
-          sha256 = "0fcq75cjvd0fh7ic0j28ly40i95clgn5i7j1sj5infycqkrj87xc";
+          rev = "dd1b9881af705b9e78f79791c9f933cabe59c125";
+          sha256 = "0ndyqz2hpvnx6kykjz4d8nmngdjfavlwchl2dasi6m98b585liqa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
@@ -26752,12 +26836,12 @@
     plain-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "plain-theme";
-        version = "2";
+        version = "5";
         src = fetchFromGitHub {
           owner = "yegortimoshenko";
           repo = "plain-theme";
-          rev = "43fc59d487d39e6110230a073f1376ab877aa739";
-          sha256 = "0g44qdpn3ni291awjklia4r26qyiavpjib04k761hfacrdkvsdys";
+          rev = "1e484668cf272ab1883cb3c1ad9e1e8639de395d";
+          sha256 = "0qhr8mch5fvy5gck5prradlrnx84h6n8nvrcqk6ynqd1nh0pnnzd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme";
@@ -26936,6 +27020,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    point-pos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "point-pos";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "point-pos.el";
+          rev = "4cd0f8c8d1296c5c64f708b6a5835e8520c51b68";
+          sha256 = "1l3mlz51wp729rm6wf72x2fk1fla2n2s1qh8h8z58inipdi2qydp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/23a1e835155fba51f595c10c46487a4c269f43ff/recipes/point-pos";
+          sha256 = "1zv6hx8i8jwq52j4la1ff0ar0bpbs2pb4gcsh9hypghba11gnync";
+          name = "point-pos";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/point-pos";
+          license = lib.licenses.free;
+        };
+      }) {};
     pony-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "pony-snippets";
@@ -28975,12 +29080,12 @@
     rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "rg";
-        version = "1.2.0";
+        version = "1.2.2";
         src = fetchFromGitHub {
           owner = "dajva";
           repo = "rg.el";
-          rev = "32fc22b192cbad03fca3835f29c36ab4a90e50a0";
-          sha256 = "168p4h7h9ik1f56cw0zr8brbn53d5jglv9r7i9zqh80zzhljw4xv";
+          rev = "261ed756377285f0f8941b7a33866ef538465d74";
+          sha256 = "1fs367w5695v8kvwka1w9kykgpq3qp1209cxkxs096rlkxhbdvv5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@@ -29626,12 +29731,12 @@
     sayid = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sayid";
-        version = "0.0.14";
+        version = "0.0.15";
         src = fetchFromGitHub {
           owner = "bpiel";
           repo = "sayid";
-          rev = "3e5456cade044f01eb0753aabc9e50868000bd14";
-          sha256 = "1asphbijh5y4ax03x1cn02l4ya8v44s23ani91a0d52msdaxbnyw";
+          rev = "b44b6d346604f8d1ef9b9180be359ce1e601a298";
+          sha256 = "0ggk60l132qgscgqbx4fdhzx6nlv2k7gbrjapkdl15slz2kyq03d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd2e05f9c9328d8f9ae434c86697a4a04af8b0d/recipes/sayid";
@@ -31220,12 +31325,12 @@
     spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spaceline }:
     melpaBuild {
         pname = "spaceline-all-the-icons";
-        version = "1.0.7";
+        version = "1.1.1";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "spaceline-all-the-icons.el";
-          rev = "8915d284fc0b5fb83c9d6300750a40ef4ac05eae";
-          sha256 = "0fhni6lxs6pa8hgq16mapsxbyiqd74x9d0hhml77lanwgyy3fxnk";
+          rev = "481329d1d1c4c505a91b7f2ac231f77a19e2c74d";
+          sha256 = "15snhm5rq0n31g9hk5gzimhjclfll67vi7avhrhd9z9x6dvq0sp4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
@@ -32494,22 +32599,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    telephone-line = callPackage ({ cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
+    telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "telephone-line";
-        version = "0.3";
+        version = "0.4";
         src = fetchFromGitHub {
           owner = "dbordak";
           repo = "telephone-line";
-          rev = "70c113bea37719c83961023afd893044398e681d";
-          sha256 = "0smdlzrcbmip6c6c3rd0871wv5xyagavwsxhhgvki6ybyzdj9a19";
+          rev = "a83dcda21b0f6e10e51c3cded7da9a5d2ead5f34";
+          sha256 = "1cg34l6jq75mcqnb3p93z0kv1arvnswm8nkk39fmryand2yygnl9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line";
           sha256 = "0dyh9h1yk9y0217b6rxsm7m372n910vpfgw5w23lkkrwa8x8qpx3";
           name = "telephone-line";
         };
-        packageRequires = [ cl-lib eieio emacs s seq ];
+        packageRequires = [ cl-generic cl-lib emacs seq ];
         meta = {
           homepage = "https://melpa.org/#/telephone-line";
           license = lib.licenses.free;
@@ -33333,6 +33438,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    turing-machine = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "turing-machine";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "therockmandolinist";
+          repo = "turing-machine";
+          rev = "41e367e54fbeff572f599f2f321ffc863601484e";
+          sha256 = "0qlm7y3pm8sfy36a8jc3cr955hqsmypzshbgxfnmcmz7wl96dplh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a003b40a52a92b3ab4d1ffc003f570d4fa6bfbde/recipes/turing-machine";
+          sha256 = "1ndy953q9hr1psqqkkqsffyvj800cnqdxcrixqiw0ls77f2kczcn";
+          name = "turing-machine";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/turing-machine";
+          license = lib.licenses.free;
+        };
+      }) {};
     twilight-anti-bright-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "twilight-anti-bright-theme";
@@ -33504,12 +33630,12 @@
     undercover = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, shut-up }:
     melpaBuild {
         pname = "undercover";
-        version = "0.6.0";
+        version = "0.6.1";
         src = fetchFromGitHub {
           owner = "sviridov";
           repo = "undercover.el";
-          rev = "e72b8c924272f65d7cc6e884478e26d0b1e1e4e8";
-          sha256 = "06qcvbp5rd0kh3ibrxj5p6r578lwsrgd7yj5c6slwmkdmna2fj33";
+          rev = "86f856c799aacfd48d2eb42d1a6afda0e6e49845";
+          sha256 = "080bmfwyfi8663y8x594770hqz7mff7zvj2v03qdfwbhdr9w9y29";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d58ad9eb863494f609114e3c6af8c14c891b83a5/recipes/undercover";
@@ -34056,12 +34182,12 @@
     visual-fill-column = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "visual-fill-column";
-        version = "1.10";
+        version = "1.11";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "visual-fill-column";
-          rev = "159dcee48e7311ee816686d62e7ce36619127462";
-          sha256 = "0bij20a8f9pd4307m2qslcx8p3j59hkr14sm18aw0bric65him8b";
+          rev = "57c2a72d46900117ea92e0a01b97e19481800503";
+          sha256 = "086zfx4lh168rg50ndg8qzdh8vzc6sgfii7qzcn4mg4wa74hnp9y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7628c805840c4687686d0b9dc5007342864721e/recipes/visual-fill-column";
@@ -34413,12 +34539,12 @@
     webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, request }:
     melpaBuild {
         pname = "webpaste";
-        version = "1.2.2";
+        version = "1.3.0";
         src = fetchFromGitHub {
           owner = "etu";
           repo = "webpaste.el";
-          rev = "72ba31e5acb424cc3f87fb9c05233729722ef98e";
-          sha256 = "07bc62ymhx2kvnqi433w2nwnhqz18x6wdp1l1jqhljbr5xk39pn2";
+          rev = "70e8fd064184632b0363572b74647c7250d6eb1b";
+          sha256 = "1zlc65c0wnp8wgnpn9f60bxm4p2g46h1s2dpqm6rrvb7yp0diml3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@@ -35527,8 +35653,8 @@
         version = "1.78";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "7bf780961390";
-          sha256 = "19nxjabwr3c5sjii2pwlgak751wq9h12yp7xd6nz8i6f75md59xs";
+          rev = "428584533eab";
+          sha256 = "1nrvlziqfsyvsk09ynpww99z4vb8zv8h2jxsslvx1nm1shyn2ckh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
@@ -35701,12 +35827,12 @@
     zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "zerodark-theme";
-        version = "4.2";
+        version = "4.4";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "zerodark-theme";
-          rev = "af231794425255d436690c9c31bceb2052251210";
-          sha256 = "1xnhcxf5d0gn8lhapjg7b289bqpf8w0d2mp76ksb8rsvx4r0bdbw";
+          rev = "60615d101769694038b17a2c75bb31c26f36a042";
+          sha256 = "09fpyhprmavv1fa97wa7lf182nhiw0797rh73xbhf7xhn1c22gbj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";

From 291a00a5021271d152ae9e4b5c6221a33fe780d3 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 10 May 2017 19:44:17 -0400
Subject: [PATCH 43/84] melpa-packages: 2017-05-10

---
 .../editors/emacs-modes/melpa-generated.nix   | 1090 +++++++++--------
 1 file changed, 587 insertions(+), 503 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 8737d9bda1c..faf73def6db 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -801,8 +801,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "298ba7caa775089e2e4a95612c5f2b0eacbe4414";
-          sha256 = "14s5y1hsp9gr6llla8jpg3sk0lazs2a3sgkmg1lmbg3xr59lcwaz";
+          rev = "2abdfb2adf24b881cdd04e904ecb341bb51e8cb6";
+          sha256 = "11f9sd8w7qqhfd6mxbihlc6mdki4lqyk4dwbi3v91k9hbxb9hlq2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -899,22 +899,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-isearch = callPackage ({ ace-jump-mode, avy, emacs, fetchFromGitHub, fetchurl, helm-swoop, lib, melpaBuild }:
+    ace-isearch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-isearch";
-        version = "20161107.1730";
+        version = "20170506.12";
         src = fetchFromGitHub {
           owner = "tam17aki";
           repo = "ace-isearch";
-          rev = "33b98ecdb3d5a966cbfc0ec7b104be5afca14f25";
-          sha256 = "05a5jf9lx1g5cms5p1js7qxria5dfm310m83zmvwcdr96mfbz9ii";
+          rev = "0502f95e333c8059a678745e5a112542965661d1";
+          sha256 = "1gzvhxkx7dl7wh2fkkiq9vplfhrqyxl0vzlzf617j4gggjbkpzps";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/344f0cf784a027cde196b7d766024fb415fa1968/recipes/ace-isearch";
           sha256 = "0n8qf08z9n8c2sp5ks29nxcfks5mil1jj6wq348apda8safk36hm";
           name = "ace-isearch";
         };
-        packageRequires = [ ace-jump-mode avy emacs helm-swoop ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/ace-isearch";
           license = lib.licenses.free;
@@ -1220,8 +1220,8 @@
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
           repo = "addressbook-bookmark";
-          rev = "2e905403922d9e79f75911586163c2cb5997a2cb";
-          sha256 = "1smfn2l4b9k422dyjzklbk2n075030hmypvhs82fnzgx7zcvzr3d";
+          rev = "2c2051aa4f9309931a0aa22e97e1e9ce16d9d99d";
+          sha256 = "1mic3v5rgg57zrsclvp1zq0bz34rcnp93vjv9lpbfj42ql72m36v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a497aec6e27efa627068542cae5a16c01c3c6d3c/recipes/addressbook-bookmark";
@@ -1529,12 +1529,12 @@
     alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }:
     melpaBuild {
         pname = "alert";
-        version = "20170429.1810";
+        version = "20170503.1714";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "alert";
-          rev = "88ecd5f8ad7c4d3b17c3a068b9b50696ae0b815c";
-          sha256 = "0wnqf67ssbhm4l3ds49jm4pbj8pxcwv5g9x3xwmbrli3h1zb136r";
+          rev = "affbbc5f359a7abcf50f4509b712fc7a80843f51";
+          sha256 = "04zxhxkk8dnq07m2cidn9mw05m2wyvix6vvbj1jaaawb60b1ic7q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert";
@@ -1589,22 +1589,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
+    all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }:
     melpaBuild {
         pname = "all-the-icons";
-        version = "20170502.756";
+        version = "20170509.318";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "all-the-icons.el";
-          rev = "9c0d6ddf22f6fa0489ef55002d72b3f8f9ed929d";
-          sha256 = "0psc6rk97d60ji8xps8w4mzj4byqdfv3hh6r4n8zvd1qyscaqy07";
+          rev = "d070531959036edabc38f39ae8cb1a15608af993";
+          sha256 = "1a6j09n0bgxihyql4p49g61zbdwns23pbhb1abphrwn3c2aap2lx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
           sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q";
           name = "all-the-icons";
         };
-        packageRequires = [ emacs font-lock-plus ];
+        packageRequires = [ emacs font-lock-plus memoize ];
         meta = {
           homepage = "https://melpa.org/#/all-the-icons";
           license = lib.licenses.free;
@@ -1631,6 +1631,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    all-the-icons-ivy = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "all-the-icons-ivy";
+        version = "20170508.25";
+        src = fetchFromGitHub {
+          owner = "asok";
+          repo = "all-the-icons-ivy";
+          rev = "73b1bd545c683903b4123df1ac3f59ff80de89c3";
+          sha256 = "1lh8i4dh0mvdjlkfnk0ann14y056ydcm5q9k5b143j8i9yxh2awy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9496e6bb6f03f35444fb204860bc50e5e1b36214/recipes/all-the-icons-ivy";
+          sha256 = "1xv67gxd2sqj6zld4i3qcid0x5qsbd7baz55m93y1ivdqi7x7gr2";
+          name = "all-the-icons-ivy";
+        };
+        packageRequires = [ all-the-icons emacs ivy ];
+        meta = {
+          homepage = "https://melpa.org/#/all-the-icons-ivy";
+          license = lib.licenses.free;
+        };
+      }) {};
     amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }:
     melpaBuild {
         pname = "amd-mode";
@@ -2458,12 +2479,12 @@
     apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apiwrap";
-        version = "20170302.1825";
+        version = "20170506.2356";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "apiwrap.el";
-          rev = "e6732de88dcbe48ae88466b5cf34fd30405540df";
-          sha256 = "1xg96pidwzxrg2r025pdc8644m8g11z9avcw3jvpmm11rvi2af7z";
+          rev = "4ae045879cb3d7ce45f0a4a8ad4520b9225ca37b";
+          sha256 = "0845qajz2jcyfjxynabdnqpgm6cm9h5sbb6wiq06q30794pvlc0n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap";
@@ -2599,22 +2620,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    arch-packer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    arch-packer = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "arch-packer";
-        version = "20170503.356";
+        version = "20170506.1005";
         src = fetchFromGitHub {
           owner = "brotzeitmacher";
           repo = "arch-packer";
-          rev = "245d5cc3beea95657c7650fec72e2ad30f0c948f";
-          sha256 = "1h8cj0slxlvmmmn4hfqa3rwzxjpa6z2mwiaisn3q3r1gcf413gkl";
+          rev = "e195c4f30da2a756f6e14715f436ff22826b5e82";
+          sha256 = "0xxgnavpcimkb9adlbpcv96pp829x41nv744c8yl8rl8lb4f9xdl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/39f13017cde2d209a58dc45f0df25dc723398b72/recipes/arch-packer";
           sha256 = "06gmkc63ys6diiwbhdjyn17yhvs91nxdhqkydmm18553pzsmcy72";
           name = "arch-packer";
         };
-        packageRequires = [ emacs s ];
+        packageRequires = [ async emacs s ];
         meta = {
           homepage = "https://melpa.org/#/arch-packer";
           license = lib.licenses.free;
@@ -2831,12 +2852,12 @@
     assess = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }:
     melpaBuild {
         pname = "assess";
-        version = "20170413.409";
+        version = "20170504.657";
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "assess";
-          rev = "87118057b3ae0e6542fa5e22050eb44d6efe8baa";
-          sha256 = "0cilb32zr38x9kfzfyr1ciag5pzbgp1dk62r7lhn8dxc2ip6f11j";
+          rev = "e5b0415126c6bd24bd220759ff04220d963a0195";
+          sha256 = "04242jhrajd9qi9dzngv33730sqhymgr0f18hf92fgb2k5649lqk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f917a34506193f2674b195569dfd3c13ba62c1d/recipes/assess";
@@ -4361,12 +4382,12 @@
     base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "base16-theme";
-        version = "20170502.31";
+        version = "20170505.1010";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "cab618939ff5bd06a96d33a4965b00eb435c7be6";
-          sha256 = "1k8skaa0rxyjby4p7nsyz4whpj1afsmcp9pvg5cmyf5sz2v9ii3c";
+          rev = "89ee73d88183b4f60f973ff0a47a571a5de46d1d";
+          sha256 = "046db0np55fdnyr7bwhl2h1cqjh1ryd09fvkwn02cv2kb7knkfig";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -5094,8 +5115,8 @@
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "0139f85595a10b9e50e38f3d8d59f70cf4f3a2a2";
-          sha256 = "1zv2an1mzks51j46j2gvizjmh7k5frzw7qja9kh9lvighl2qrg2v";
+          rev = "54ce52604477c237b663a02d49be9d6d307d49bd";
+          sha256 = "1rpyfbh0zp6a013nva2b1czis10mr8vzv52qlhgcfm78m48bvhya";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -5611,12 +5632,12 @@
     boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
     melpaBuild {
         pname = "boon";
-        version = "20170406.1153";
+        version = "20170508.733";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "boon";
-          rev = "c6fd2ade38842007204d780d329ccad035386650";
-          sha256 = "19zvnp4y509ym2mq7sj7s5s4vm66ifkc2cqh38sjlpp09rnfg3hy";
+          rev = "b5326c5bd68f2dbeef87adae6657eb24f068dbc5";
+          sha256 = "1mxzsm1zkb99hpn7hav0yph3s04cbkhyj7dps49rphfp8s0ks90f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
@@ -6091,11 +6112,11 @@
     buffer-sets = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buffer-sets";
-        version = "20170501.1503";
+        version = "20170505.829";
         src = fetchgit {
           url = "https://git.flintfam.org/swf-projects/buffer-sets.git";
-          rev = "4b6562d933b52cce76b1fea90d42f03777c3c5bc";
-          sha256 = "1mavhlaw5h848i223bhhxjrqjalda8svpkfcp8yw2da8r1f7f4z8";
+          rev = "dd47af82f6cd5c4bab304e41518d4dc06bd6e353";
+          sha256 = "1wsx7m9wmzc6yiiyvsjmlqzazcss4vaq8qcdm3r1gybli32llraw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e12638554a13ef49ab24da08fe20ed2a53dbd11/recipes/buffer-sets";
@@ -7111,22 +7132,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    centered-window-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    centered-window-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "centered-window-mode";
-        version = "20170406.635";
+        version = "20170510.1334";
         src = fetchFromGitHub {
           owner = "anler";
           repo = "centered-window-mode";
-          rev = "ac8b7eca96a771e6921ffd6fad09566c0447092c";
-          sha256 = "0lkamd4qi2pp2riqw90flgq6rrz8mrjqghmzppng06dafalyfxnv";
+          rev = "cb1b7d010c8f59969fd326983503ee6935d9da8e";
+          sha256 = "12210z0aa9arhah2s4gpc4k9l29i293qgz1zimaryizxcfqvp4n8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/centered-window-mode";
           sha256 = "08pmk3rqgbk5fzhxx1kd8rp2k5r5vd2jc9k2phrqg75pf89h3zf4";
           name = "centered-window-mode";
         };
-        packageRequires = [ s ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/centered-window-mode";
           license = lib.licenses.free;
@@ -7181,8 +7202,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "126a2f60b79470664a0e7572579ced20bf21b474";
-          sha256 = "03yqfk3r7ymdri5y582vqrphq9n6jxnb9z19b304sy2b21mvfggj";
+          rev = "5c98a709d1a282354af57781c500467f3562e18f";
+          sha256 = "0j48v4ai7hn5mxhs3acwmyndzlzlxgzdvqj0a2205w22alb7dxdn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7221,7 +7242,7 @@
         version = "20170201.347";
         src = fetchsvn {
           url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "12178";
+          rev = "12189";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -7532,12 +7553,12 @@
     chinese-fonts-setup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-fonts-setup";
-        version = "20170422.1932";
+        version = "20170507.245";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-fonts-setup";
-          rev = "02c996e14c0dac64a02c47b01b64dc578aedafc0";
-          sha256 = "0vjdwq7bghq2gxm5n9jgk3l7wjvq3dpmrm5a45icx2vr0m05r0jb";
+          rev = "43f08ae41903dce980aed8b8ee1e92aee2c4806e";
+          sha256 = "074hgpsfzk0zwrnhm6j3q6hw4ygqf08fpc4zbn8f32dsvcd2nlws";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c536882e613e83a4a2baf86479bfb3efb86d916a/recipes/chinese-fonts-setup";
@@ -7721,12 +7742,12 @@
     chinese-yasdcv = callPackage ({ chinese-pyim, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-yasdcv";
-        version = "20161030.1504";
+        version = "20170504.321";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-yasdcv";
-          rev = "664494d4c4562a4d83a0e73386f854829d7a52c0";
-          sha256 = "1qnhyv4b3sy596r3jz13iypi3jyr266lyphpw82ivb6dx33awk70";
+          rev = "92231de8771f2ffc9f5bb9b4ee08700fdb1a9dcb";
+          sha256 = "0viihcrnf7psqkfj2izdaah2w5bkz2cm46bgbhygzfqx8424vqh7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b6d727c30d2ec0f885a927a16a442fe220a740d5/recipes/chinese-yasdcv";
@@ -7803,12 +7824,12 @@
     chruby = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chruby";
-        version = "20161222.430";
+        version = "20170509.700";
         src = fetchFromGitHub {
           owner = "plexus";
           repo = "chruby.el";
-          rev = "04182d666e19963fa0389cb744fc5cce62049a62";
-          sha256 = "0cj5cs2bj7r5ijhz9vyfyzcq4mfccya34n9gs2vjdr2fg9mhgynx";
+          rev = "3eddd2f5fc2ac979b496394c74e4aee436b64a28";
+          sha256 = "15fihl38fa3jzn4r0abjpkqzibsrn0pnlvab6xba0ffr4sv4m0y2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1989a3c6fa4cd7aaf6b0b202f197eb7db51936b9/recipes/chruby";
@@ -7824,12 +7845,12 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "20170430.816";
+        version = "20170509.208";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "e4b9cf0cd781ff7ec2e589141b91599210648fba";
-          sha256 = "00kfl8nxqscjr1hb05qgi9gdi1jjgsb1swr9l4p3i1ijzwj8ax3x";
+          rev = "d84b8a8ba77cd685b3a4bc474b1928461cc86bf3";
+          sha256 = "1xj6ymyrr156w1cyw571dnnws0013c819x3lvl4cgiaj05nd4422";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -8013,12 +8034,12 @@
     circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "circe";
-        version = "20170304.419";
+        version = "20170509.1443";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "9d68903018f255838b51c734015be74bbdbf539c";
-          sha256 = "0iddz0m7p7bfnly33gwi8vmpz0lv026lj4val1x584hqix6xk8vh";
+          rev = "1e90e5a89d07bd1584e990c35f5a9d564334a1ae";
+          sha256 = "13pv21bk4khq97a7km7gpj8rmwkmcb1y1nk72w35b9kipxv76vg2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe";
@@ -8100,7 +8121,7 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "302019";
+          rev = "302728";
           sha256 = "1m3h5kln4v2hcwc4ahzk356415iizcg8cmika8221qvqci4wj7bm";
         };
         recipeFile = fetchurl {
@@ -8549,12 +8570,12 @@
     clojure-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "clojure-snippets";
-        version = "20161024.16";
+        version = "20170508.42";
         src = fetchFromGitHub {
           owner = "mpenet";
           repo = "clojure-snippets";
-          rev = "bc9144ae5cd9e4468a9d34f1ae8a05d9933e5a39";
-          sha256 = "1xcjlid47w4xjxishal2rvfdwk7qyphy2v2bphdaysllccclw9pq";
+          rev = "1c6b37578c38d538ae017b23d4cd8697963b077e";
+          sha256 = "1pnxxzjbf0irbxapj7f4rqfv9j1x3qdgyq6pzi566c1qld3bkwn6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4898fc6746b30b0d0453b3b56d02479bfb0f70b9/recipes/clojure-snippets";
@@ -8742,8 +8763,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "96820279541017402c1fe0852444aac68179ddb7";
-          sha256 = "1f3sgyhc8gywm90wpsahkfw966wvf4nmm2h4ragf71j1g4l1abc4";
+          rev = "8cc9e07a2ca7018feb0dbc286f1db23a4294eeec";
+          sha256 = "010ip83v6kbaqjwl8jv3n8by9zv8aldkpal1ass39dvp5rl7q56y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -9217,12 +9238,12 @@
     color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-sanityinc-tomorrow";
-        version = "20170503.151";
+        version = "20170509.327";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "color-theme-sanityinc-tomorrow";
-          rev = "48eb1936c23c59f5c6dcce271bc8b80178fafd5d";
-          sha256 = "1s624fgd56bkc46qqfp0xawxl5687j267mhz5fk4n93i26z0cb61";
+          rev = "b1fd68e9114413825aee28491f1bb7de917ef758";
+          sha256 = "0ai93fs7l86ih8smf0j51cn0wqph0c3y41vzpbnw9fck3bbxmivk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
@@ -9664,12 +9685,12 @@
     company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "company-coq";
-        version = "20170424.639";
+        version = "20170504.1519";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
           repo = "company-coq";
-          rev = "2480548183935f3d2c75e64a0ecd3a57303e1913";
-          sha256 = "0q6gdbflwhdbc2pa6g1rrd63d1gr9q84w4njpvk6g9djvqdvj1vp";
+          rev = "561a7e9243669c1edf406472f85a2836ebfcec4c";
+          sha256 = "1gk7in9arz4dnkyysxl0wbigf7ssnr3qr4jzjca2c731n8sc566b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq";
@@ -10265,12 +10286,12 @@
     company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "company-rtags";
-        version = "20170405.2311";
+        version = "20170504.49";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "298ba7caa775089e2e4a95612c5f2b0eacbe4414";
-          sha256 = "14s5y1hsp9gr6llla8jpg3sk0lazs2a3sgkmg1lmbg3xr59lcwaz";
+          rev = "2abdfb2adf24b881cdd04e904ecb341bb51e8cb6";
+          sha256 = "11f9sd8w7qqhfd6mxbihlc6mdki4lqyk4dwbi3v91k9hbxb9hlq2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10286,12 +10307,12 @@
     company-shell = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-shell";
-        version = "20170501.645";
+        version = "20170507.445";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "company-shell";
-          rev = "a1cffbc8bf320fdeac6d48fe7aaecd8bfc268de7";
-          sha256 = "1hnnd5rwkcdav4v3jm3sqxqjkbsn6vr7qls3wwqvacrmbkxyf7q6";
+          rev = "57445b8116148875ad80f434af55781749c72960";
+          sha256 = "0kh0cwhivj3gnh2vml98rlfqfzfn8lkvz5kws9ni0r86fcdlwdc0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bbaa05d158f3806b9f79a2c826763166dbee56ca/recipes/company-shell";
@@ -10437,8 +10458,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "4c3dad6229d6c2b628490c599b53cdc707531659";
-          sha256 = "1iyq7njhc1kjj9gkpy958dd4vkwzkr2b31bvv97sj2l1lhg63gwd";
+          rev = "05f0409fb7902daf49b4cd329e5c9ef569d77689";
+          sha256 = "0mp05xsphbidjgskp2pnv2x54z95dzmvfwdddpgmysmc99sz305y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd";
@@ -10789,12 +10810,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20170501.1903";
+        version = "20170506.1638";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "3a00c5a18da3547983e29be496e538a7130f85fb";
-          sha256 = "0j1d2zbjj527bs6igmnibjyfkb84icgdwkablp2jpafwpxi8jpgh";
+          rev = "f565f76dfb3a31becc32c807916c011cde6c4e64";
+          sha256 = "1dl39b4c7jij0gxdri2li6nkm7x73ljhbk0n1zwi6lw4xd7dix6p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -11020,12 +11041,12 @@
     cpputils-cmake = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cpputils-cmake";
-        version = "20170203.155";
+        version = "20170507.629";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "cpputils-cmake";
-          rev = "5bad6a1f1042e45fa6d2c20fd901100d14d455ff";
-          sha256 = "0ag0wkyf1y4q0cnv8gixrbhhaf871x3r97izb82v42i47cnwk228";
+          rev = "0d4b22cbf548e0d1ce4e79cc82ada3747bb5d389";
+          sha256 = "0cg5cnvcd5nz15bpwi5h6972dlr2kxbzbz23lsq35hcbg3gj22k7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b84a159e97f7161d0705da5dd5e8c34ae5cb848/recipes/cpputils-cmake";
@@ -11567,8 +11588,8 @@
         src = fetchFromGitHub {
           owner = "mortberg";
           repo = "cubicaltt";
-          rev = "9f649f16d473a39df10655ea30c3096d06e7d0fd";
-          sha256 = "1w6iig0k5b2n9rw74ffvscfiab5vz6n20mqw9b03c4cn8qqj1x4d";
+          rev = "40797d45bce17024e8a8bc1ae8598de0397b7adf";
+          sha256 = "1mcc1ai51zw575kw0w4dam58bplj8wamf2qvnckc45cjcifci549";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt";
@@ -11834,8 +11855,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "73f045236bacf035ab9f4fe38e23705f465fc9d6";
-          sha256 = "1pzjwbsc2ly0haw756swrcvj1n4452vyvbx2zh0m8lxjfhsgqz62";
+          rev = "b20ed8ddf161d467d4c8b2088e7040b370855af3";
+          sha256 = "0dilcfzp47mlf5mjpl72nxrby75bma1r87s63qiybmv779rc0h63";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -11911,6 +11932,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    dakrone-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dakrone-light-theme";
+        version = "20170501.654";
+        src = fetchFromGitHub {
+          owner = "dakrone";
+          repo = "dakrone-light-theme";
+          rev = "4b3f3ba8e2ffc35e537507894620245c96ff8965";
+          sha256 = "1191iyjc5pw6jy9kqmjgr1s4n88ndjdsys7hwzc8c18glv411r69";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f3a88022a5f68d2fe01e08c2e99cfe380e3697b7/recipes/dakrone-light-theme";
+          sha256 = "1njlpvfa4ar14zn51fdmby55vjgfkpskizg5rif2f3zn6y4np2xw";
+          name = "dakrone-light-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/dakrone-light-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     dakrone-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dakrone-theme";
@@ -11956,12 +11998,12 @@
     dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "dante";
-        version = "20170430.1336";
+        version = "20170508.2347";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "dante";
-          rev = "03afbbd5029339c6a4fa3fe4ff79b4818f062295";
-          sha256 = "03x8p8rjfipgxgy6mjg6r2ss4x565m2d0cai7i6ghk7mf8i7ipl4";
+          rev = "05141a7f1ea9c368b469825cdc31c54194740c9d";
+          sha256 = "158b083jlx4zi219z63nlim02gj7vds51bxxpvbhyw7222m5ddyv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
@@ -12754,8 +12796,8 @@
         src = fetchFromGitHub {
           owner = "liblit";
           repo = "demangle-mode";
-          rev = "0f9436f98225e0f5a5deecea4680c173e76f0322";
-          sha256 = "0n10c45lvdfczhd2mpkciggv4d83mcnbpmjhxzvmnf7n5ar6aw6a";
+          rev = "19716fbc60851192aae6b4d4aaad5dcc1c88627a";
+          sha256 = "0wmaf4278479zs2vic837ss1p99n7fhygcpcmy80i28fbfyskr6p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ced9f4ffb051a8474d3f72695156416cf2dd8be/recipes/demangle-mode";
@@ -13914,12 +13956,12 @@
     disaster = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "disaster";
-        version = "20130509.1055";
+        version = "20170507.1626";
         src = fetchFromGitHub {
           owner = "jart";
           repo = "disaster";
-          rev = "8d8fc67af5b3d876b0056562ece0478e6e2367f0";
-          sha256 = "1srlz63pncxndh1kmb6dl5sxaanspxa444wg998dld3dkdflwavq";
+          rev = "3bab3c0db29c6d5484ab8aacbf29490e3aa2d713";
+          sha256 = "15brdrcq2i3rckdh2ml5m1fvf7asgqij9swc1p9fgp1fk2i05sfn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a4654b3646b96f967e2c75440e664a417cd0f517/recipes/disaster";
@@ -14654,12 +14696,12 @@
     doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "20170501.2212";
+        version = "20170510.1144";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-theme";
-          rev = "4f43a05d051cb74d7a6e4dad5ebe87169ae4d11e";
-          sha256 = "1f04pnnvim3jpjxrlisj12c1gxbj3j2ca63hnvvvb61wrfwjilym";
+          rev = "8a4e364a96b404a87f731d87ed76db8bfe0880b5";
+          sha256 = "0hw701d2vd72rw8yqfkf3rk3isiizm6djy0fbsll1pf79lvwvz66";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes";
@@ -15089,7 +15131,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1793641";
+          rev = "1794764";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -15190,12 +15232,12 @@
     dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "dumb-jump";
-        version = "20170501.1316";
+        version = "20170510.1430";
         src = fetchFromGitHub {
           owner = "jacktasia";
           repo = "dumb-jump";
-          rev = "2372300982bab406b80ecfe7209c35ae0388f603";
-          sha256 = "1r8j1fw37s4r4hidan1px8wvlnl7cssks2pqgp9l0vcyr7fwzl3g";
+          rev = "175f9f57a5319f2917390402c0b47f7d7000a5dc";
+          sha256 = "0sw5p1jgfxqmg3f3cikd87sncgcb7zqdkhcqc83fv1y17zxl1xa9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump";
@@ -15420,12 +15462,12 @@
     e2wm-direx = callPackage ({ direx, e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "e2wm-direx";
-        version = "20140815.1613";
+        version = "20170509.601";
         src = fetchFromGitHub {
           owner = "aki2o";
           repo = "e2wm-direx";
-          rev = "f319625b56c44e601af7c17fc6dbb88e5d70ebae";
-          sha256 = "09i7d2rc9zd4s3nqrhd3ggs1ykdpxf0pyhxixxw2xy0q6nbswjia";
+          rev = "b47f19d15436cc28233a812a1150689f61d11046";
+          sha256 = "0lihc02b0792kk61vcmhi0jwb7c4w2hi19g6a0q1598b3rci82nf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8320cf626050cf455c97ef22e7a8ccfb253e3243/recipes/e2wm-direx";
@@ -16216,11 +16258,11 @@
     editorconfig-custom-majormode = callPackage ({ editorconfig, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig-custom-majormode";
-        version = "20170426.127";
+        version = "20170509.141";
         src = fetchFromGitHub {
           owner = "10sr";
           repo = "editorconfig-custom-majormode-el";
-          rev = "52880ccfcbcd4444c6003f37904b5ea1ed2bba95";
+          rev = "b5350d20b2730a0f029c9e1d651e50cf9a809fa9";
           sha256 = "1xk3c0g0a6g2p7wg26aphl6cdz45iql0s4w1qa8np2hly10a4cxy";
         };
         recipeFile = fetchurl {
@@ -16549,8 +16591,8 @@
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "4274e2f59010150abf103cf8896db4d62e6cf08d";
-          sha256 = "1r517q4cs356bd8akvk3dh3f98ik05nylk41s5w07kb3n3n3dkg9";
+          rev = "464ed451b506956ac7ec36c2a62be73243510291";
+          sha256 = "1jzk1798arigjdz99ss6ll8cbd8fxagn2mz7afcissvaq7rw35rm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -18067,12 +18109,12 @@
     embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "embrace";
-        version = "20170413.1110";
+        version = "20170508.1526";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "embrace.el";
-          rev = "a57b4be5d60daf8c176f9bd35770540c2d3963c9";
-          sha256 = "0sn81a7f8g5i4q74byfkj0jlg4aj0rxpfvx9sqv8azcg6wq2f65l";
+          rev = "02396165b6672c8c4cc800d25bdcc31e28b7f3da";
+          sha256 = "045xdfm1li0wkhrcd2h77bviw7n4bxid7d4f482gala16y9mbjvx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8f07e3b5ba4ec4b0b79fba5a2cca5a3986218b6/recipes/embrace";
@@ -18233,12 +18275,12 @@
     emms-player-mpv-jp-radios = callPackage ({ cl-lib ? null, emacs, emms, emms-player-simple-mpv, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "emms-player-mpv-jp-radios";
-        version = "20170330.904";
+        version = "20170506.1024";
         src = fetchFromGitHub {
           owner = "momomo5717";
           repo = "emms-player-mpv-jp-radios";
-          rev = "7c3dc98e86a178c217bec74fb1e5da7de00fded9";
-          sha256 = "0xdqi3fi26pj166z2f1fpl9ckdma9rsck324ha343r2y3snfzch0";
+          rev = "43ef07db6e724847fdcff5f66d1806b3e8d315e4";
+          sha256 = "15wfr6qs4k6anm16zing0rgawpbrnk9589vr06fc6qvkald7ib3v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/09ba6da5057061f055d4a3212d167f9666618d4f/recipes/emms-player-mpv-jp-radios";
@@ -18518,12 +18560,12 @@
     engine-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "engine-mode";
-        version = "20161104.650";
+        version = "20170508.828";
         src = fetchFromGitHub {
           owner = "hrs";
           repo = "engine-mode";
-          rev = "9a1271b0051b9c939a63fa395cda2b5b64c5f36b";
-          sha256 = "1nvf7anv2yplfhs4xbvrxdgd3mb41mzv4y1119lrqfvhsfd07ii5";
+          rev = "59f1d463fada670895b00bab406160570fb8bc35";
+          sha256 = "1j8jym795k59lhsckvnh06mykz7b2f54v52n0dwvhyy2aaq0bnhl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ea1b5dfb6628cf17e77369f25341835aad425f54/recipes/engine-mode";
@@ -18623,12 +18665,12 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20170502.2314";
+        version = "20170508.3";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "4767e98d2355a3b0c7c47930c950e18939469f8e";
-          sha256 = "1k3aya3laip1fmly85r2yw1yvsw4gsqp7jscmilram6ckjrp8f97";
+          rev = "8117122e36a77f9e5616c4260680a07317aebe80";
+          sha256 = "02qmpppawziqpsyb2d2mrdyvs4mn6mvcn5smnkkanibabwgld9za";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -19155,12 +19197,12 @@
     ereader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, xml-plus }:
     melpaBuild {
         pname = "ereader";
-        version = "20170417.603";
+        version = "20170508.2149";
         src = fetchFromGitHub {
           owner = "bddean";
           repo = "emacs-ereader";
-          rev = "141a50f2fbac5b7edd59ad5e899aa14c719e9ed5";
-          sha256 = "08kcwldjwk7jksbhzzdyq96jchhniw56rg8hvahc6az2vra3qcb1";
+          rev = "258807f77b203963dbc855c5e34da3d7f2751abc";
+          sha256 = "0wnl7vfxgvz4qp3lpx48wl1mni1alkawm460nvivsr02dgmriwaa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ereader";
@@ -19218,12 +19260,12 @@
     ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "ergoemacs-mode";
-        version = "20170328.832";
+        version = "20170509.1202";
         src = fetchFromGitHub {
           owner = "ergoemacs";
           repo = "ergoemacs-mode";
-          rev = "87fe85ac20a6ac32b41df5e7464d6ace5528445b";
-          sha256 = "0s2yf8hkigbzp5rhkznlkg4jqx3darj4i7h3dpbajc2lnc1c9nmc";
+          rev = "3e6fea941af18415b520f2fabc45349c4a148a8f";
+          sha256 = "1b0whc2llfff6wggiran0df7wrh06mygca0cqpps6ljfniqcxl5y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode";
@@ -19260,12 +19302,12 @@
     erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "20170428.34";
+        version = "20170509.742";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "95e22b101b73087630fd58ae2487a91fcf004334";
-          sha256 = "1ksnlgrgkh3n62rmzrzacjq8lvfxiisz0pjadg26sxxy6mhbaagk";
+          rev = "b7a5e0e9070adcd3bd14b8315caa3007b7d2e89f";
+          sha256 = "1v2ydy6zpy1fhx3zz6a66xxyfs7zvm27fvagan553670qmfpgi59";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19973,12 +20015,12 @@
     esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "esup";
-        version = "20170125.43";
+        version = "20170508.1536";
         src = fetchFromGitHub {
           owner = "jschaf";
           repo = "esup";
-          rev = "a63ab0cd57a37317256b15a3f5f30c2b11d92c25";
-          sha256 = "07bpcihmzaf7av2sbzs0pr0cw21xqr3nnalj3cwxv7d6yhc8g4qf";
+          rev = "efaf44d0739391aed48c77b5cd3013b50027ed36";
+          sha256 = "1ddff6scpnljl9h957zx7nahxd6si0gcznkg5da09sa7vpds0732";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup";
@@ -20074,12 +20116,12 @@
     ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ethan-wspace";
-        version = "20160317.920";
+        version = "20170507.1330";
         src = fetchFromGitHub {
           owner = "glasserc";
           repo = "ethan-wspace";
-          rev = "b8eae49ed3e7f646c16234970af5663e3090e720";
-          sha256 = "1xqc4lqzirpmr21w766g8vmcvvsq8b3hv9i7r27i5x1g0j4jabja";
+          rev = "e055ee6730c0b03525d32e67511ef6c51e4c29e4";
+          sha256 = "0ik3y60xd3ap1pg5dr5ab6bq4qh8gblpgz1iiprmv7acr3ckzc41";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9454f3a58e3416fa60d8411b0db19c408935408f/recipes/ethan-wspace";
@@ -20221,12 +20263,12 @@
     evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
-        version = "20170419.37";
+        version = "20170510.1321";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "f0684c1f6644a8c4e0e5fce50a1a04796555eaf1";
-          sha256 = "0q5zg7d3ml9v1hylmngvb6k45f2lakrq7xcn9z1qkbk1b003j6rz";
+          rev = "0445068b65a9702660db1abef4f96ad393e29dad";
+          sha256 = "0qm0ih4by38x6m99gpan3k3fmjhivi084iylgc7bg5bg3vncflrn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil";
@@ -20578,12 +20620,12 @@
     evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-goggles";
-        version = "20170425.1702";
+        version = "20170508.1509";
         src = fetchFromGitHub {
           owner = "edkolev";
           repo = "evil-goggles";
-          rev = "056a35572e818fa5ea7144768d77a62600f1fea7";
-          sha256 = "1ngrmalk14a71mvnc0z813npn552df0gynkjv4ra8y0y4plryxjl";
+          rev = "cb295a7f6882f7b885886aca8bb88ce119973f40";
+          sha256 = "0w04plip3kf1kzky4528550jvlwbp965p41697fr7kwsc7ipymx4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad1b922fc3a6c74b1fd5c8477f769a22bf2241fb/recipes/evil-goggles";
@@ -21502,12 +21544,12 @@
     exec-path-from-shell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "exec-path-from-shell";
-        version = "20170304.1309";
+        version = "20170508.4";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "exec-path-from-shell";
-          rev = "15d07666fb356008e612278f181292e2d2afc5fc";
-          sha256 = "0kjsxwadxysx3ccgdwd12k4vj43qjs3zd6z4f8sycbk732x0893d";
+          rev = "5e355fbc50913d1ffe48bf86df0bcecd8b369ffb";
+          sha256 = "1flkhbyxa7mi97vj4w6c2anzq7qz51sac6yqk308blfvd9z3pf95";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/exec-path-from-shell";
@@ -21669,12 +21711,12 @@
     exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
     melpaBuild {
         pname = "exwm-x";
-        version = "20170502.1644";
+        version = "20170507.622";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "exwm-x";
-          rev = "f008acd531597566c68b3dc00067d9be5f3d8cd1";
-          sha256 = "1f2pyvafhm22y7w9x7fdh60yggpm6nsid5hm6r8vl9xd5gq9pl97";
+          rev = "bb894c44ffca623f37461617bdc53b2092ca2b4c";
+          sha256 = "1xkandsng3r79vp2i3kqcva35qs4wvcafjxzsnawrvgbskh8kd1g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
@@ -21753,12 +21795,12 @@
     eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eziam-theme";
-        version = "20170321.608";
+        version = "20170508.1613";
         src = fetchFromGitHub {
           owner = "thblt";
           repo = "eziam-theme-emacs";
-          rev = "c53e4b4ba21bd00196a28746a900f3fc1a9d1cbc";
-          sha256 = "0dbh9q0s1vps5nwdy16jcq5sqw9ilk0s9qlmbkiy0cvs4z08wgd1";
+          rev = "7b10585034d773348049a7f6b7d9552137f96f73";
+          sha256 = "1j9lgykfwyl8iy8p2n6kg10b7xmpq0wkr8gvikk4i43jpag3flp8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
@@ -22432,12 +22474,12 @@
     find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "find-file-in-project";
-        version = "20170402.2100";
+        version = "20170507.150";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "a81f7d7020d5bdfcc835911d4def6f09301a1f55";
-          sha256 = "167anv3qyslfzyrcq4qnzhdx8zhbj1r0lmrvnp1spsalvcbph9ih";
+          rev = "1f5b7ef7c6e00ab6fb818c4dc9131c1fe7806704";
+          sha256 = "0pcq992pd5vsajsrcpkp5jl3sgxk1p2p0i8in050rs25i3l3lgj0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -23188,12 +23230,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20170502.2305";
+        version = "20170507.113";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "6ab177c96ead5ffd8ae492080d09db63505852b0";
-          sha256 = "0296ab8k1daq8d79pwvrq4m2jl4vja7vpzjvjcalbpnn2hvqmm26";
+          rev = "4cb411b27b244af81ef40318f7854abdccc38291";
+          sha256 = "0kfq9h81nh9j8kv7fcx1qh7yx2kmq7l6lkdivabwh6jbnvdyw23n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -24154,12 +24196,12 @@
     flycheck-pos-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }:
     melpaBuild {
         pname = "flycheck-pos-tip";
-        version = "20161112.912";
+        version = "20170504.1504";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-pos-tip";
-          rev = "88b5a6d7ce0f313cbd22d554ea248aab95357d33";
-          sha256 = "0jfgq346b4nh9wry3mnf4sfbv3l78kgadklvbv0nxykvlpx9c1rv";
+          rev = "7b94c0c1e3185a4350dc39885add3927037ebad8";
+          sha256 = "0m56rflfdzddfsr1xlgzfl7i259786hxsnwa0m729140c6v8f5wh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/698843f75e17b9e6160487c0153f9d6b4af288f6/recipes/flycheck-pos-tip";
@@ -24242,8 +24284,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "298ba7caa775089e2e4a95612c5f2b0eacbe4414";
-          sha256 = "14s5y1hsp9gr6llla8jpg3sk0lazs2a3sgkmg1lmbg3xr59lcwaz";
+          rev = "2abdfb2adf24b881cdd04e904ecb341bb51e8cb6";
+          sha256 = "11f9sd8w7qqhfd6mxbihlc6mdki4lqyk4dwbi3v91k9hbxb9hlq2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -24431,8 +24473,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "4c3dad6229d6c2b628490c599b53cdc707531659";
-          sha256 = "1iyq7njhc1kjj9gkpy958dd4vkwzkr2b31bvv97sj2l1lhg63gwd";
+          rev = "05f0409fb7902daf49b4cd329e5c9ef569d77689";
+          sha256 = "0mp05xsphbidjgskp2pnv2x54z95dzmvfwdddpgmysmc99sz305y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd";
@@ -25769,10 +25811,10 @@
     frame-cmds = callPackage ({ fetchurl, frame-fns, lib, melpaBuild }:
     melpaBuild {
         pname = "frame-cmds";
-        version = "20170222.1758";
+        version = "20170506.945";
         src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/frame-cmds.el?revision=92";
-          sha256 = "1r2hyl7f1rgw20mh8nj0lzf491p5pl4pfprv0yj0jls5jaqds4xc";
+          url = "https://www.emacswiki.org/emacs/download/frame-cmds.el?revision=93";
+          sha256 = "1ax9hcrhhwll4m4xi0dvsv4q498cngq5xzib6n2ka706fmnjj0rj";
           name = "frame-cmds.el";
         };
         recipeFile = fetchurl {
@@ -26024,12 +26066,12 @@
     fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }:
     melpaBuild {
         pname = "fstar-mode";
-        version = "20170501.229";
+        version = "20170504.2114";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "fa8cd790b6c017b720d623879b13ff17d32352cb";
-          sha256 = "0393wrzd89dg880j7pzs7c6c0zsc839b4abwp9v4xjmp9v3nd1fy";
+          rev = "f1ea9d9eb1c529f6a3859779d24718b4fc8ee7a1";
+          sha256 = "0v4r3nczn8whi0drsqrm2zdq4lj0l95hbplqbr80z420y6xchasc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fstar-mode";
@@ -26056,8 +26098,8 @@
         version = "20170107.626";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "e44104c8d2b832ab8e023c9b5b31417b77e649d1";
-          sha256 = "1q0x4s1lqkxjnzppphvcvnpl6d61mp5gz5zx4pa0xms8zk6yln9f";
+          rev = "c1d6477c22df9cd0604c2b06aca919a53674bb78";
+          sha256 = "1lz1bwgjvjijs3v2v6qyivzbz9jl7zx55n65hlsq0nq6limjd8bh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -26178,12 +26220,12 @@
     futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "futhark-mode";
-        version = "20170502.1145";
+        version = "20170506.1334";
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "d9b774da4dcccad4e7d3868a46591cef7c65436c";
-          sha256 = "13g0gji1ql0ydyj6b0rqa2fja90pl43iwhn8xvh2h0b5kl2c5m24";
+          rev = "f7b42f135db488dc449e18108bdde176937c6a8c";
+          sha256 = "1wiwbpd0ssb07q0wlr5rj7wkwdfgff9s5d9fldpwvsyhad6p4dj2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26634,12 +26676,12 @@
     ggtags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ggtags";
-        version = "20161022.251";
+        version = "20170510.744";
         src = fetchFromGitHub {
           owner = "leoliu";
           repo = "ggtags";
-          rev = "2149f3a4a855ccebbe0c8832079a9f5d5d50909a";
-          sha256 = "1nggwr28wbiz0ch7c5w9rs909gm5qxdqhfnv7d4zikfh568dv8y5";
+          rev = "c7948943155eb712eb5aa1eeae8b50c8bb2eca13";
+          sha256 = "0qcwykjpa5424jpkw6s895827ym2cq5rv6j773wksnlbsg0v429v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b158bb1bc2fbe3de61a6b21174eac7b1457edda2/recipes/ggtags";
@@ -26991,12 +27033,12 @@
     git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "git-commit";
-        version = "20170314.1414";
+        version = "20170510.910";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "595f7c6fac10a91f9edb68615f23d05b3d829f3c";
-          sha256 = "1a5lglslbhsnwjaspxbxj2kqnz53k7vkfb91xj73pqxk9lr8m2y5";
+          rev = "d783e7b2427ed0c2d25895bcecc7190b9e953b97";
+          sha256 = "04hbgbrfdv9jn86p0g9rw6yzfbgfbqxhiq7y9ncc4dm4vfmrli66";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -27138,12 +27180,12 @@
     git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-lens";
-        version = "20170501.2323";
+        version = "20170509.258";
         src = fetchFromGitHub {
           owner = "pidu";
           repo = "git-lens";
-          rev = "5628b6f82462d44d041c9703879e8699116fc729";
-          sha256 = "1wr53dx310zfdrc5abrb5ga3fia2nmgrwbps737l2glxka0g91bm";
+          rev = "5999cbeb365930dcd56a7c44083bf3426c58e018";
+          sha256 = "1k2kq2fqrlmgvkpngyxfh77ilg0pcjr160rhg0ml775i0jcvk3hy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/66fd7c0642e8e61b883d2030f88892d039380475/recipes/git-lens";
@@ -27159,12 +27201,12 @@
     git-link = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-link";
-        version = "20170301.1618";
+        version = "20170504.1834";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "git-link";
-          rev = "8d43732a753bcea8a7777b03755c17a0f45094d2";
-          sha256 = "1p439cwrxkcf36qfv93j8h2xyynynysr9ch9w662mhm7k7fgwc65";
+          rev = "88bb1cddbcbaa52c674288173fc0806fc6d4a904";
+          sha256 = "0yj0rldpvyfz939ld9pfgpamlzrc70wchvq094js6il78514lr49";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link";
@@ -28505,8 +28547,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "styleguide";
-          rev = "15f2836d9fea3835d541d4d327ccf053d4052822";
-          sha256 = "1yrd7v75pcpb658m53ysgai3ak5nvrm7bf7hzhga3rgm20hhsc16";
+          rev = "c212f99186958f25d3d20994144ea11df923da79";
+          sha256 = "1lhld1y3zxcj30fwjydiza4kfjpd2z1nc88kk7jkgzz670yk8qi4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style";
@@ -28755,8 +28797,8 @@
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "b8b228cfbad7f0a69ed90393ca9aee085d3c6ef1";
-          sha256 = "03p33p1hvr34ams41hy68p5rmmbsizcm606myfaj7f07dfl9l0gv";
+          rev = "35caa01bfa4cbff15d06382021e2028bdf0a77ad";
+          sha256 = "0j4xwlr1zlvhj6193nvqbfz5wmcr2dnmv2n6qsdyzfxk25z6ngc0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -28881,8 +28923,8 @@
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "1f233c26c90b4f77b18a05decfc16a57a71e4d82";
-          sha256 = "1s41wxkl3lqasm5f2qmq3iv19cchfwfn6r1l4asm9j25mcbkk2z9";
+          rev = "9849318762a1f495b3c8913e47256450c1854489";
+          sha256 = "0f0h6syghw0kfqzway1f8hc0agrbdsdc68931bjprm7fm43dhrzw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -28919,12 +28961,12 @@
     grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "grandshell-theme";
-        version = "20170118.2148";
+        version = "20170507.104";
         src = fetchFromGitHub {
           owner = "steckerhalter";
           repo = "grandshell-theme";
-          rev = "c0884bfe0b2df8d6279cabd5ef6c521aaf7c0897";
-          sha256 = "1cn3i4kp5pjiaq96svam3xn1s33lpysnzk77vq25wp65vz9jpbcg";
+          rev = "2f7e607cde9dd38ad4a95f3f3ad6cd85eba09f7b";
+          sha256 = "0mc29g3hz7fb2a91rr24z2fnlqdwnq1q3lh14qyd7i9zpy5965dl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme";
@@ -29057,11 +29099,11 @@
     grass-mode = callPackage ({ cl-lib ? null, dash, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "grass-mode";
-        version = "20170303.854";
+        version = "20170503.800";
         src = fetchhg {
           url = "https://bitbucket.com/tws/grass-mode.el";
-          rev = "5383fff2996b";
-          sha256 = "1igbdrs14dmaa5mbhq3jnrkq16nndingflpnwxi921dag613c3jz";
+          rev = "1ae8eae88117";
+          sha256 = "1sl3d5759fjm98pb50ykz2c05czb2298ipccwj2qz2hdzq63hfv8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grass-mode";
@@ -29259,22 +29301,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "groovy-mode";
-        version = "20170323.817";
+        version = "20170503.148";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "1f233c26c90b4f77b18a05decfc16a57a71e4d82";
-          sha256 = "1s41wxkl3lqasm5f2qmq3iv19cchfwfn6r1l4asm9j25mcbkk2z9";
+          rev = "9849318762a1f495b3c8913e47256450c1854489";
+          sha256 = "0f0h6syghw0kfqzway1f8hc0agrbdsdc68931bjprm7fm43dhrzw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
           sha256 = "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal";
           name = "groovy-mode";
         };
-        packageRequires = [];
+        packageRequires = [ s ];
         meta = {
           homepage = "https://melpa.org/#/groovy-mode";
           license = lib.licenses.free;
@@ -29367,12 +29409,12 @@
     gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gscholar-bibtex";
-        version = "20161006.1944";
+        version = "20170509.1134";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "gscholar-bibtex";
-          rev = "734696423b8f807e6c1f0e871a8577a5f3a731f3";
-          sha256 = "1vva58pcrh1rbvl1yyiy0fw2vmnfzlkpinjkr9yv19zmh0jphjzd";
+          rev = "ba505ea5043092444afb4284ae268d37e1c51e54";
+          sha256 = "199jf65px1bbybyag5980fa99vjflrfp9s6dcxq1ascszrram0pl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9fa546d3dce59b07a623ee83e3befe139dc10481/recipes/gscholar-bibtex";
@@ -29388,12 +29430,12 @@
     gtk-pomodoro-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gtk-pomodoro-indicator";
-        version = "20170310.532";
+        version = "20170327.948";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "gtk-pomodoro-indicator";
-          rev = "902f5c8b2563ff6805f89505419b68ed0ff1e397";
-          sha256 = "1fmnpavcz8s6m2sxbpk38l45q9kckc5w6sqray0i9hw4a1qc3fvf";
+          rev = "35da6b5eeb91ea2488e25be5d8200a060c88aea1";
+          sha256 = "19q99bwdbii0qvk9lkr0z8iy1h131j69q4zwbjgwslj19vq12mn6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b98ec72605077f3b3f587713a681eb2144f29645/recipes/gtk-pomodoro-indicator";
@@ -29472,12 +29514,12 @@
     guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "guix";
-        version = "20170420.351";
+        version = "20170508.1218";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "9343c749ebf4ffbd3961042ba0e5d0b00f688df0";
-          sha256 = "12r2rlyh8xmx0yn17yb4qpb0c50rr553p39nfj17m0ishrgb8vbn";
+          rev = "41a9d7ba0acfd19e4c669aed12684e852bf886ca";
+          sha256 = "1vkhzb9mzcrm7yc6vccd0937j19hg1m3jbswlb7qjl3gi3dc57hr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -29980,8 +30022,8 @@
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "8165d8a809c21e220a257806ebe88180cbc8694a";
-          sha256 = "1vx6liapkkfsd678nmlsx3r641v2vxxbqk82cw6cqanzp3i5p7y4";
+          rev = "90a352f0d23ffc46a626d512c1c76d70994e77a8";
+          sha256 = "177r3vv9vh24bxara2wq4nrfi6yvfchi9syy8j5ridj2l3vzsxiz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -30245,12 +30287,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170503.19";
+        version = "20170510.853";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "ba171080eb4baa1f913c28caeefbb17589fcdacc";
-          sha256 = "1zfz4dx7kfviqc9kg1079f8lwqns999y3iw5rmmqw97q7rxwy50s";
+          rev = "ab8e6fa02968b0391d45c0003355a958335c0946";
+          sha256 = "0ch05a4kiw7dbiffja5p019776pfk4g0i62vl2vpklpbnggxrfzx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -30434,12 +30476,12 @@
     helm-bbdb = callPackage ({ bbdb, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-bbdb";
-        version = "20161122.522";
+        version = "20170505.2338";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-bbdb";
-          rev = "20513422102fea4c08a0433d728a7783bb4968c8";
-          sha256 = "0ns537fimv774n1bq0r8k4qwdpapbw96linqyhx9mxp23zkhlg80";
+          rev = "c0e6b83911598fe334c51b12f51ff1a8252ed11d";
+          sha256 = "084m23w4088njk2c8z6yxi2851dakdq71jhpazlzms85i2dlwg21";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7025c319fcabc64576c0c6554d0d572cef697693/recipes/helm-bbdb";
@@ -30833,12 +30875,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170503.19";
+        version = "20170507.531";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "ba171080eb4baa1f913c28caeefbb17589fcdacc";
-          sha256 = "1zfz4dx7kfviqc9kg1079f8lwqns999y3iw5rmmqw97q7rxwy50s";
+          rev = "ab8e6fa02968b0391d45c0003355a958335c0946";
+          sha256 = "0ch05a4kiw7dbiffja5p019776pfk4g0i62vl2vpklpbnggxrfzx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -31085,12 +31127,12 @@
     helm-emms = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-emms";
-        version = "20151001.1328";
+        version = "20170510.755";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-emms";
-          rev = "ed3da37e86ea5dabc15da708335b1e439ae0777d";
-          sha256 = "0330s07b41nw9q32xhjdl7yw83p8ikj6b2qkir3y0jyx16gk10dl";
+          rev = "a00839beffc34f252dd4c75553e5a414577dd2ae";
+          sha256 = "0pfb6b1g7wsj1yj75nm152d7n247zbzc9pg1nqb9x3cw7ln2dgpg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/db836b671705607f6cd9bce8229884b1f29b4a76/recipes/helm-emms";
@@ -31505,12 +31547,12 @@
     helm-google = callPackage ({ fetchFromGitHub, fetchurl, google, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-google";
-        version = "20170407.1156";
+        version = "20170509.244";
         src = fetchFromGitHub {
           owner = "steckerhalter";
           repo = "helm-google";
-          rev = "b3f10af10075f1982434d4c27c5933124940942a";
-          sha256 = "102g8yb15rpyxs4pndqqbskg4b8g8ssqk9wfxs9zlyah5qcb2m33";
+          rev = "b24de3240b2a46fdf6124e91aa4f684b2370454b";
+          sha256 = "1w48ag2pd462hf238hkdl0i6csvchcsdf3021lnkdy41vwxj1rdg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/88ed6db7b53d1ac75c40d12c21de1dec6d717fbe/recipes/helm-google";
@@ -32113,12 +32155,12 @@
     helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-org-rifle";
-        version = "20170429.2219";
+        version = "20170509.1646";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "helm-org-rifle";
-          rev = "ccf5224302ad5a028ff4f5c717ccfc74e6a34c22";
-          sha256 = "1969axixs230d8xv61mmv85xl1c5vf58xp5vdvmyzgn0nmxnfs0p";
+          rev = "9570ee6ddf67ead1baafaf1128b6ea5069aa97df";
+          sha256 = "0v93cmgnd4v6skkn7aag1x0z8pin0mr3myqaxi08knwz31j8s2r8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -32621,8 +32663,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "298ba7caa775089e2e4a95612c5f2b0eacbe4414";
-          sha256 = "14s5y1hsp9gr6llla8jpg3sk0lazs2a3sgkmg1lmbg3xr59lcwaz";
+          rev = "2abdfb2adf24b881cdd04e904ecb341bb51e8cb6";
+          sha256 = "11f9sd8w7qqhfd6mxbihlc6mdki4lqyk4dwbi3v91k9hbxb9hlq2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -33468,8 +33510,8 @@
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "hierarchy";
-          rev = "81b6c5d03d289a1168fd794cb9cc0bc50a3581e0";
-          sha256 = "05s32d5j6vr6gyk6qq0ns2fh6j4pqwg6rj617m63f0adqbxnngnv";
+          rev = "18722f28baf24e2040c5ba00e548bd2e73b52bb4";
+          sha256 = "1f07hpg8v1xyxn2nrwz5hq1m9iq162k7b0sgi5jnq55zyii25dvr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy";
@@ -33646,12 +33688,12 @@
     highlight-indent-guides = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "highlight-indent-guides";
-        version = "20170420.1557";
+        version = "20170508.1133";
         src = fetchFromGitHub {
           owner = "DarthFennec";
           repo = "highlight-indent-guides";
-          rev = "8298186c3b4da68d000b06c317f0572c09ba391c";
-          sha256 = "0czv1mg30rn069zddzjfy1i6kjkrrps96sp45bjbjkc66c6mvpw9";
+          rev = "9614941bce44e16d0681ad1f3f87ca072582a325";
+          sha256 = "1lw9pmykwswi0rg1y80v7ng29fdhymr4wn6k2p3q3yk78d9hi3m0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8acca65a5c134d4405900a43b422c4f4e18b586/recipes/highlight-indent-guides";
@@ -33941,8 +33983,8 @@
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "hindent";
-          rev = "b14e690af82e48fee6b3fd596bc96d4c1c31ea04";
-          sha256 = "1ypmvr57x3q1kp85yadl5wfphdhd40aqmd6aklcn3hi3ddnsxb7j";
+          rev = "a62a7d09912674842063239983995c3cb6e5b411";
+          sha256 = "0cgwshmng2dnwfimrrpd4m4r74rj7v875wmlvpmxiak9idjgm6a9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -34025,8 +34067,8 @@
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "historian.el";
-          rev = "0838ed60febaf618cf242377d92aa9b5c4e42fae";
-          sha256 = "1zzngs5xqqib2yj19snwndyc27s8lfm6nfsya9zvz4bafizgdn6k";
+          rev = "d5e4283d2fc06445d2cd14d9d2e86ca41b9f718d";
+          sha256 = "0am0xjvk77bvppgx90knxicq3nw1ia68gplyqw9lqw62qj4028ip";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f16dacf64c52767c0c8aef653ac5d1a7a3bd0883/recipes/historian";
@@ -34330,12 +34372,12 @@
     hlinum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hlinum";
-        version = "20160521.2112";
+        version = "20170507.2227";
         src = fetchFromGitHub {
           owner = "tom-tan";
           repo = "hlinum-mode";
-          rev = "bc92bb8344af61929ffb0cb4df9d6b30d7df80d1";
-          sha256 = "1yfq55gzg6p17qbd9xf0g9cza5bzkvl47rkjq19mf6kjxk0ihkh7";
+          rev = "2b4a08db4ff361ac8eeee1ed94eca7e26c614595";
+          sha256 = "0j2ras605i2zsna02lp8k4mkyhln65cggmgkhgr9imcxfzwpjzqk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/41bca7b89a7ce52d4c9381b9a4046b7103996c4f/recipes/hlinum";
@@ -36142,12 +36184,12 @@
     impatient-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, simple-httpd }:
     melpaBuild {
         pname = "impatient-mode";
-        version = "20150501.247";
+        version = "20170505.1921";
         src = fetchFromGitHub {
           owner = "netguy204";
           repo = "imp.el";
-          rev = "eba1efce3dd20b5f5017ab64bae0cfb3b181c2b0";
-          sha256 = "0vr4i3ayp1n8zg3v9rfv81qnr0vrdbkzphwd5kyadjgy4sbfjykj";
+          rev = "11600a8441a1c0339252b0c19f151ccac3ee96c7";
+          sha256 = "1k251pidqgjn380xbs2h3j02r76lq1gcqkslwfpvq2g3l3ksqkkd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb1fbd03f17d2069a461260ad5e2ad4e5441919b/recipes/impatient-mode";
@@ -36205,12 +36247,12 @@
     importmagic = callPackage ({ emacs, epc, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "importmagic";
-        version = "20170101.1603";
+        version = "20170504.1725";
         src = fetchFromGitHub {
           owner = "anachronic";
           repo = "importmagic.el";
-          rev = "c75afbb93b024307c4cf67e6dd44cda80bbea697";
-          sha256 = "1xz99g9j8gfd6qrdsmrf98mq61168divw8lrwl3zylfw04x20b4b";
+          rev = "135e049d763ceb4cabd0bab068c4c71452459065";
+          sha256 = "1fzd3m0zwgyh3qmkhzcvgsgbnjv8nzy30brsbsa081djj5d2dagq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic";
@@ -36289,12 +36331,12 @@
     indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
     melpaBuild {
         pname = "indium";
-        version = "20170502.942";
+        version = "20170504.117";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "Indium";
-          rev = "a26190da110220efc7a63db485bee8ddbf1c6a94";
-          sha256 = "1d3i8f7kdlsvc4ryw9khfxwqba9dwq81xjdm4cn6k7s6r95x7cgm";
+          rev = "cf07e83d0f7357355d814ecdbe32aec3a5cc1eaf";
+          sha256 = "1y7cb1pll81nnrq7d27pfm7kzmnxlbms184j8flnipag91h9dgqc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
@@ -36331,12 +36373,12 @@
     inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-clojure";
-        version = "20170501.1042";
+        version = "20170509.1254";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "inf-clojure";
-          rev = "c797a5aea3d2126b19c48ed99aefe3ebddd5f304";
-          sha256 = "1m8bkh8mwl1zbvpgllrghpqr5m86lkwxn3jl3i0qd60arwy51iiy";
+          rev = "4e96e936a760c48d55f60b395a5ef65a69dd13cc";
+          sha256 = "11q3j7pq178pv7l71l0vszwcbsn7rcl4x0qgx62vyj7k3mldvr26";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -36853,12 +36895,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20170410.1625";
+        version = "20170506.1859";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "e546ea086d72b5bf8556727e2983930621c3cb3c";
-          sha256 = "1qv7l5ri3nysrpmnzfssw8wvdvz0f6bmymnz1agr66fplazid4pn";
+          rev = "2db59100d2eff6bd9e34a0067c36fbab0d0ec72c";
+          sha256 = "0q0h7fikp4v8m55ci3xfmqhzh5z1rpygc4idcpnvlzgc61a7kzgi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -37124,12 +37166,12 @@
     irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "irony";
-        version = "20170502.1506";
+        version = "20170503.1447";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "irony-mode";
-          rev = "349d007d55e06094a2223c14bcbc0025904e77b1";
-          sha256 = "1p6ssl3d0knjc7nnbj57ksac2yj1k4zaagh5lbsh87cc9dwkvhd0";
+          rev = "823854936e8d228ab7350d0f1cf4801ed000f142";
+          sha256 = "125qwy3zpxhckqmlbxd5s2ni7910xpkv8qgdrmcafk7ld2ipjvz9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -37418,8 +37460,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "3a00c5a18da3547983e29be496e538a7130f85fb";
-          sha256 = "0j1d2zbjj527bs6igmnibjyfkb84icgdwkablp2jpafwpxi8jpgh";
+          rev = "f565f76dfb3a31becc32c807916c011cde6c4e64";
+          sha256 = "1dl39b4c7jij0gxdri2li6nkm7x73ljhbk0n1zwi6lw4xd7dix6p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -37502,8 +37544,8 @@
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "historian.el";
-          rev = "0838ed60febaf618cf242377d92aa9b5c4e42fae";
-          sha256 = "1zzngs5xqqib2yj19snwndyc27s8lfm6nfsya9zvz4bafizgdn6k";
+          rev = "d5e4283d2fc06445d2cd14d9d2e86ca41b9f718d";
+          sha256 = "0am0xjvk77bvppgx90knxicq3nw1ia68gplyqw9lqw62qj4028ip";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fb79cbc9af6cd443b9de97817d24bcc9050d5940/recipes/ivy-historian";
@@ -37523,8 +37565,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "3a00c5a18da3547983e29be496e538a7130f85fb";
-          sha256 = "0j1d2zbjj527bs6igmnibjyfkb84icgdwkablp2jpafwpxi8jpgh";
+          rev = "f565f76dfb3a31becc32c807916c011cde6c4e64";
+          sha256 = "1dl39b4c7jij0gxdri2li6nkm7x73ljhbk0n1zwi6lw4xd7dix6p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -37603,12 +37645,12 @@
     ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "ivy-rtags";
-        version = "20170415.1027";
+        version = "20170509.2100";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "298ba7caa775089e2e4a95612c5f2b0eacbe4414";
-          sha256 = "14s5y1hsp9gr6llla8jpg3sk0lazs2a3sgkmg1lmbg3xr59lcwaz";
+          rev = "2abdfb2adf24b881cdd04e904ecb341bb51e8cb6";
+          sha256 = "11f9sd8w7qqhfd6mxbihlc6mdki4lqyk4dwbi3v91k9hbxb9hlq2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -38168,12 +38210,12 @@
     jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }:
     melpaBuild {
         pname = "jdee";
-        version = "20170428.1341";
+        version = "20170506.1514";
         src = fetchFromGitHub {
           owner = "jdee-emacs";
           repo = "jdee";
-          rev = "9505591c3d5ff120d3e1c7736bc8869a281880c8";
-          sha256 = "0lbcvhi9swgx3by9qfw3d861qxj8spiaiygbxwh4p0lqmbz6wfad";
+          rev = "5b0bcf6db09d6f6d4ec68c1f3d748d91f189b5ea";
+          sha256 = "1vq4x1kvwbynb7kb6mq03939dqg3jjj6jkhkl8jjc6lk3rz7fj29";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
@@ -38670,12 +38712,12 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20170429.455";
+        version = "20170503.1846";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "659f683dbae890d9483bfc603c5599280987f1c2";
-          sha256 = "14xwpbasc7jws2gr0d53wvn4rl9bd2b9mgrmwr5jv0rx3ijvgag5";
+          rev = "ca7df5bf9d0a76b77edfb6d6fe11e83965aa2cb3";
+          sha256 = "14s4i150ri7x6360dr6n4gmyzfvwjrb4xck20wmfgyszys2h8ypd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -39233,12 +39275,12 @@
     kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kaolin-theme";
-        version = "20170502.424";
+        version = "20170510.545";
         src = fetchFromGitHub {
           owner = "0rdy";
           repo = "kaolin-theme";
-          rev = "085470e1570c42a78bbb1ee289fa687f807a157c";
-          sha256 = "1p21842mrr1g226k0qaqlwgzb0mkr3j27aihfjjdsshw9g93q3af";
+          rev = "13395f561028cefaf17f5026b2a0067f0c985a76";
+          sha256 = "1hjpdsax55rvna1wh52pn8nc23s4z449d7g1v97cwfrhzz941v9x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
@@ -39741,8 +39783,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "9352dc350980630c5c2bc69e1b245f279164f41b";
-          sha256 = "0q09a5ln2bhfnksb9a5ycfmp5lbnqrr46i5p4n5fd53jzwj7dccp";
+          rev = "fa1e0b28340ef6d9e0a7cf4629986afb25d58c0c";
+          sha256 = "0rfh15j1s4hda37gvblyflbb4fs5aqnwfwbd18dp8n552v85483y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -39758,12 +39800,12 @@
     kiwix = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kiwix";
-        version = "20170116.503";
+        version = "20170508.1802";
         src = fetchFromGitHub {
           owner = "stardiviner";
           repo = "kiwix.el";
-          rev = "edea2234a7a5267c1888dbe2271e9100bdc3f5a8";
-          sha256 = "0b9bwcgxm2gachh2g5cn4fih2n5mzqzvl591ahq0rylgajxmxvhp";
+          rev = "a62f9e7c17ab34b183b36ae63408123a75689a5b";
+          sha256 = "0v86haw2nfd7q4yylzd0ls6916l95960c15khjnv1cfyshhri5q7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kiwix";
@@ -40010,12 +40052,12 @@
     kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "kubernetes";
-        version = "20170502.2331";
+        version = "20170508.337";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "kubernetes-el";
-          rev = "977a0d1cb2c79c39588f3e356b4ca1ed0bb199b0";
-          sha256 = "0s3krnbd1b9v7qyrdspdnlp1n9jxzlh23681kgxzp2pi40llnq2w";
+          rev = "52223c7c09f709fb4897283fbc3bf7561e86f5d2";
+          sha256 = "1h5sryzb945pk46zlalsssc63nwjvnx9qhdz5ssfm1jr96ci3m2y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes";
@@ -40031,12 +40073,12 @@
     kubernetes-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, kubernetes, lib, melpaBuild }:
     melpaBuild {
         pname = "kubernetes-evil";
-        version = "20170502.1416";
+        version = "20170505.251";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "kubernetes-el";
-          rev = "977a0d1cb2c79c39588f3e356b4ca1ed0bb199b0";
-          sha256 = "0s3krnbd1b9v7qyrdspdnlp1n9jxzlh23681kgxzp2pi40llnq2w";
+          rev = "52223c7c09f709fb4897283fbc3bf7561e86f5d2";
+          sha256 = "1h5sryzb945pk46zlalsssc63nwjvnx9qhdz5ssfm1jr96ci3m2y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes-evil";
@@ -40700,12 +40742,12 @@
     leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "leuven-theme";
-        version = "20170309.1340";
+        version = "20170508.1319";
         src = fetchFromGitHub {
           owner = "fniessen";
           repo = "emacs-leuven-theme";
-          rev = "4b11c7d4ea4dbde316844d3c73be9bafe12ac911";
-          sha256 = "0saaakcs32i0bal2v6zcw1r27jzbs3hlhcsvr0k9dkhyi2kv2nwn";
+          rev = "185e19f49ad05e9d813c10d24381f3e35b8c719e";
+          sha256 = "1vxfw5nqvbv12wp0015fg5cm8z1zirya4sbr1xbakc758fq5q8j3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme";
@@ -41082,12 +41124,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20170430.402";
+        version = "20170510.925";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "2853551c60880282bcf76554eb39e008d0d9b712";
-          sha256 = "0zdm17z9xbs0488i8a31dn55ypmr6zgj7b88frjh93jpns218xrs";
+          rev = "aa5b20f69180a09da16c66bb05a18eeaef3c2668";
+          sha256 = "1rdxrwg5b415ag22zdfmf9af86cpnm9ji2vyw30w799dnsaxv0zh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -41504,8 +41546,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "ea59a2471779a76cb73cd4d83bec3a022ff91e21";
-          sha256 = "1wg7qacrygj3ji5rhdd7jlkf4lyk150jw1xzrj4aqjkiwwydna0l";
+          rev = "3ba25d2222701517a0e00ba189a1d47b58fb7359";
+          sha256 = "1y7v50w3i07jzizj5vrbqiafz2355bxw6hai3v7vam15ii3ir6fw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -41919,12 +41961,12 @@
     lsp-java = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
     melpaBuild {
         pname = "lsp-java";
-        version = "20170421.325";
+        version = "20170506.213";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-java";
-          rev = "a5aeccc2c8b37af13d48616aa3e96d4b1a7d20d3";
-          sha256 = "1vzvx38n57jfzarwl3hw188smn8dwjzz1x4rpsp3x6yza685s7cf";
+          rev = "fc30a0606e48049f14d750e3478d1765921424f7";
+          sha256 = "09vbj8v77samb4r4dl6ib566z4s1angrh2kgymcc5pi23cxhchkm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-java";
@@ -41940,12 +41982,12 @@
     lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "lsp-mode";
-        version = "20170501.606";
+        version = "20170510.726";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-mode";
-          rev = "c668464205d81b50d8297e78b75f12beef6fc654";
-          sha256 = "1q4f1xiznj5m7yrcf319lxf5kqyqdxi6d2hwj47l19gimjch8v64";
+          rev = "228980c3fe73c111ce6035a3d5e210da450cc052";
+          sha256 = "0gwxvglfgp5fblwg14wwrj74wblsapv8plqvsdfca7myzkvrp7yk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode";
@@ -42295,12 +42337,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170425.638";
+        version = "20170508.936";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "595f7c6fac10a91f9edb68615f23d05b3d829f3c";
-          sha256 = "1a5lglslbhsnwjaspxbxj2kqnz53k7vkfb91xj73pqxk9lr8m2y5";
+          rev = "d783e7b2427ed0c2d25895bcecc7190b9e953b97";
+          sha256 = "04hbgbrfdv9jn86p0g9rw6yzfbgfbqxhiq7y9ncc4dm4vfmrli66";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -42491,12 +42533,12 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "20170420.544";
+        version = "20170508.936";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "595f7c6fac10a91f9edb68615f23d05b3d829f3c";
-          sha256 = "1a5lglslbhsnwjaspxbxj2kqnz53k7vkfb91xj73pqxk9lr8m2y5";
+          rev = "d783e7b2427ed0c2d25895bcecc7190b9e953b97";
+          sha256 = "04hbgbrfdv9jn86p0g9rw6yzfbgfbqxhiq7y9ncc4dm4vfmrli66";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -42953,12 +42995,12 @@
     mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
     melpaBuild {
         pname = "mandoku";
-        version = "20170325.1917";
+        version = "20170508.27";
         src = fetchFromGitHub {
           owner = "mandoku";
           repo = "mandoku";
-          rev = "ab6cccaccea2d0d26fc461942b4ae3ea65bd8f39";
-          sha256 = "0k4dcm4gkjy82nhcg00wgk2hipzbzvrwn8qyvjjn5r6h1jcpmfb3";
+          rev = "0e733fdaea77150539455656c2e6af08d19611b0";
+          sha256 = "0sfyxdb3pnsdygk832w7mpxps1gwqaa0fqk2qrzqgl61yjlfvnd6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -43100,12 +43142,12 @@
     markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markdown-mode";
-        version = "20170317.1202";
+        version = "20170510.1137";
         src = fetchFromGitHub {
           owner = "jrblevin";
           repo = "markdown-mode";
-          rev = "0f88075c9091b4120fac96aaf091ec647d2ea555";
-          sha256 = "0cjchpnfwj06y4whnlj3a005ckn3l6ylpv1zmhxv5233znnp6zhs";
+          rev = "c9cb29b2e0caa516bf0fc33e0ec6682d4c837445";
+          sha256 = "0bnpsbldpc7c0g5xlj9jrz5lziab54vwqyg3pkfsjilsxg24wwds";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@@ -43338,12 +43380,12 @@
     mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mastodon";
-        version = "20170429.952";
+        version = "20170505.1201";
         src = fetchFromGitHub {
           owner = "jdenen";
           repo = "mastodon.el";
-          rev = "ac10d7a647aa77aa933076a523a48ec0a283dd15";
-          sha256 = "1cy11qlms6499vjphnx5yxpknvs1a90q67ibrijhwyhsy9gi798l";
+          rev = "4d0bd43c0ede0159c0f0130a5565ea5a6511997a";
+          sha256 = "0l0n9l7j4inwyd4z8yvf9bi3cmq6ba5dm90lwzqx8hykwdh8ghi7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon";
@@ -44045,12 +44087,12 @@
     mew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mew";
-        version = "20161224.1535";
+        version = "20170508.22";
         src = fetchFromGitHub {
           owner = "kazu-yamamoto";
           repo = "Mew";
-          rev = "8138c83339071884a2d6c5365a088ba8da4a0fc0";
-          sha256 = "0yvqarinibrg7f362gg1i3r2wgjmzzv0j71zcrp9id30gfwbs6z3";
+          rev = "7ea2baefff668263bf011c72879c2aa88125f2de";
+          sha256 = "1i7i600hj76ggn1jwlj8r60kf157pxj88a4wwp1lasz91wp6msdv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew";
@@ -45083,12 +45125,12 @@
     monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "monroe";
-        version = "20170220.540";
+        version = "20170507.653";
         src = fetchFromGitHub {
           owner = "sanel";
           repo = "monroe";
-          rev = "6190d9935109e116944296be2faa46773e545d91";
-          sha256 = "1lp0xbsgiajbx27fnsx61krcbj6p0frar4wh5dq6i98af46vwly6";
+          rev = "9f5e0a226a40f0e9775ab351d33dfe9b841f7a25";
+          sha256 = "145m0lh9jypg26qdnpqj6480gk2g5g1qjzj7gz6fpgdj6940sip5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe";
@@ -45562,12 +45604,12 @@
     mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mtg-deck-mode";
-        version = "20170419.1926";
+        version = "20170506.1701";
         src = fetchFromGitHub {
           owner = "mattiasb";
           repo = "mtg-deck-mode";
-          rev = "029f814d3261b02f650ff361f52d9d80611bbfbc";
-          sha256 = "05k0ssxmjp7lpj803lrcbyqxmxf1vnxa2j3wvpvlqrixjc63mjr9";
+          rev = "55d493b2e4ad0d931659d1785bcdacc6f16bed07";
+          sha256 = "1fp9q094glk4m2l6hf51ryj1qi4g3q7134hf6qjf707xv2vjcihm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode";
@@ -46770,12 +46812,12 @@
     neotree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "neotree";
-        version = "20170227.1731";
+        version = "20170507.1711";
         src = fetchFromGitHub {
           owner = "jaypei";
           repo = "emacs-neotree";
-          rev = "4d1e221cd052c5b471fa2a18658e4e3a480785c7";
-          sha256 = "1wiljbs302b1x754307ci9vzwndkkcfryn89idrlhimjbibw6i30";
+          rev = "5e1271655170f4cdc6849258e383c548a4e6e3d0";
+          sha256 = "0hx72fq10772bbyqrj7mhhp02k26cccjxdadiqm1ykainhfmn1x0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree";
@@ -46896,12 +46938,12 @@
     ng2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "ng2-mode";
-        version = "20160910.820";
+        version = "20170504.2007";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
           repo = "ng2-mode";
-          rev = "e48698fd474fb1b76356101fc97df00eaa610ddd";
-          sha256 = "0k356rw2ack1bf5f0km7fljws5iml9f8scp1ykpf86kskrl2gygq";
+          rev = "adbfe16a47cf26edeb1b508cbedae5307b4efbf6";
+          sha256 = "0ll850wpr4dyh25mq41afwbz17mqz82i53hfn970n9vw2icf36py";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a856ecd8aca2d9232bb20fa7019de9e1dbbb19f4/recipes/ng2-mode";
@@ -47109,8 +47151,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "08355643ab2811256b8d78265757d9aab216b38e";
-          sha256 = "1rmq21z3lykzm7iz05jxhl3bb8xdp14f8fk23misxgyjn1yr4lmr";
+          rev = "1fd59447d56a88add8874f9a8b0885a1acd13606";
+          sha256 = "042pabfg6ssc1fr0zzflsnrbfnj64a5j90nnzrdvpy2jilgb04jw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -47378,12 +47420,12 @@
     nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nord-theme";
-        version = "20170501.942";
+        version = "20170506.2351";
         src = fetchFromGitHub {
           owner = "arcticicestudio";
           repo = "nord-emacs";
-          rev = "a94a28fa6f1492be228fbeea8f275d62a28c94b4";
-          sha256 = "1xzyh76x4i789xlja9ibvp5dd7dcmdab7mfbvx1m4l6hdghwxp0z";
+          rev = "8962f7c77f2a27c0e0b649653c212fa310cce130";
+          sha256 = "0az5l8y3jg6yk587wvgz1v5671d8p1vf9m0529x9axi1x7yzxry1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme";
@@ -47420,8 +47462,8 @@
         version = "20170420.258";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "77c9ec1fddcbe145facfc3d65eee55b11ad61fb9";
-          sha256 = "08y191khn0zbjysai73rgcrgvq4y25mc870h3xrpa0lsd51fmvdv";
+          rev = "11d47950c18f2d19718e35b7264dabf2ff2fd621";
+          sha256 = "0arfwk0aycp39451z8a5xv5rhdy40avyczqv7v69sla4kxw04rik";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -48593,8 +48635,8 @@
         src = fetchFromGitHub {
           owner = "OCamlPro";
           repo = "ocp-indent";
-          rev = "ade286009fdc241270e46ec28d2813c84c6c15eb";
-          sha256 = "0kh1p3f05nh0krcxvbr7l9229g8gf4h2czk4fahs72m7rlh53iqi";
+          rev = "d3f250b6029a7afec0d7ddd8770d9c4a7e5b9c7c";
+          sha256 = "1h8w7vcaykhgf4vmrkp1c7y566bzi7av4cfvkp4l01817chrhyaz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent";
@@ -48880,15 +48922,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild, popup, s, shut-up }:
+    omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }:
     melpaBuild {
         pname = "omnisharp";
-        version = "20170404.2224";
+        version = "20170509.104";
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "93c188938305533ea34ceca51dd53c7841598ada";
-          sha256 = "0ynjxf0r9i5yb98pnhrcm55shhv4gqfr0wigfkz83yqzpsjzq6fn";
+          rev = "59aa5ac1957b4875e13f52885255293608a960f4";
+          sha256 = "1jjhksrp3ljl4pqkclyvdwbj0dzn1alnxdz42f4xmlx4kn93w8bs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp";
@@ -48900,8 +48942,8 @@
           cl-lib
           csharp-mode
           dash
+          emacs
           flycheck
-          json
           popup
           s
           shut-up
@@ -49306,22 +49348,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-babel-eval-in-repl = callPackage ({ emacs, eval-in-repl, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    org-babel-eval-in-repl = callPackage ({ emacs, ess, eval-in-repl, fetchFromGitHub, fetchurl, lib, matlab-mode, melpaBuild }:
     melpaBuild {
         pname = "org-babel-eval-in-repl";
-        version = "20161120.1243";
+        version = "20170510.700";
         src = fetchFromGitHub {
           owner = "diadochos";
           repo = "org-babel-eval-in-repl";
-          rev = "1e3189e2da14c1c2a2b793c6563597c1aa7d1122";
-          sha256 = "0vf77wc1pq9dfqkrnagkxfg7klwyaichms492jsp0dh5warnw7hm";
+          rev = "38d02b8e2412381f6498c29511d1981a88b7d7f4";
+          sha256 = "0fwmcignkglx73spk3cv7acap15yrn0c0npr4ikfc9prs6svaah6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-babel-eval-in-repl";
           sha256 = "0brqp0w9s28ibws4idlm1rw09lsfa98l5wbpwm64rvlixhs6zlnx";
           name = "org-babel-eval-in-repl";
         };
-        packageRequires = [ emacs eval-in-repl ];
+        packageRequires = [ emacs ess eval-in-repl matlab-mode ];
         meta = {
           homepage = "https://melpa.org/#/org-babel-eval-in-repl";
           license = lib.licenses.free;
@@ -49351,12 +49393,12 @@
     org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-board";
-        version = "20170403.916";
+        version = "20170507.858";
         src = fetchFromGitHub {
           owner = "scallywag";
           repo = "org-board";
-          rev = "1daf7bbd52edec82156f0289d42fc7b190f0bc3a";
-          sha256 = "0sm4gr17yi2iki28yimzk5mffp9xfpafk6abi6c6frxab0x42vg5";
+          rev = "2978aee8981a2ff5c09104b2d8b055957b277078";
+          sha256 = "1vbpwzzrl5vq0vwkwn0cr1w9wkfbjd9rmxbpsddm0sbx7k4m3am9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
@@ -49372,12 +49414,12 @@
     org-bookmark-heading = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-bookmark-heading";
-        version = "20160325.2359";
+        version = "20170510.1008";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "org-bookmark-heading";
-          rev = "6c8aad7bf98387875836873040e7815d8720ba84";
-          sha256 = "0hhw9w5aj8rbfrifpr4djppif5hwgzdb3x1az4gdwvc2dsgd8psf";
+          rev = "c535fd9b430d2cc50b54a1ab550d64e20ebd5bd6";
+          sha256 = "0v2321lzivxd35174xgsnc95g49dlcgj8lzb6nlid1ri38fhqwyl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaadbd149399c6e3c48ac5cbeedeb29a3f5791f1/recipes/org-bookmark-heading";
@@ -49502,8 +49544,8 @@
         src = fetchFromGitHub {
           owner = "rexim";
           repo = "org-cliplink";
-          rev = "4c7c126ad3421ef076e4eb6358c57389b40a5e53";
-          sha256 = "1z514mrppdd3yir6apyf12nqhqsmyzlrh1xfvcb8m6q2f12ny7f2";
+          rev = "6c134fdda7bb56cc960af87d06a81a6885f6ab0e";
+          sha256 = "1x339lg1q1aq57jycfxwdmipl05wjb0d1b5psqbn37xvmkm3imgg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ddb13c59441fdf4eb1ba3816e147279dea7d429/recipes/org-cliplink";
@@ -50130,8 +50172,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "cbe544edf33a97ffffd3a03f550ffa85e45c18e4";
-          sha256 = "0jygzkvzf9qf1qy6160kgvfyc3i8rrj8jfalb5j82wigh33j9w2q";
+          rev = "6fee6b6cde5e82e8632408c865681c3aa709013a";
+          sha256 = "0as51c7p1r3a5n62h4a2iwqps9ib3rzrdmd1i3c25d3id7mkaixq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -50150,8 +50192,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "cbe544edf33a97ffffd3a03f550ffa85e45c18e4";
-          sha256 = "0jygzkvzf9qf1qy6160kgvfyc3i8rrj8jfalb5j82wigh33j9w2q";
+          rev = "6fee6b6cde5e82e8632408c865681c3aa709013a";
+          sha256 = "0as51c7p1r3a5n62h4a2iwqps9ib3rzrdmd1i3c25d3id7mkaixq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -50167,12 +50209,12 @@
     org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-mime";
-        version = "20170218.501";
+        version = "20170506.2244";
         src = fetchFromGitHub {
           owner = "org-mime";
           repo = "org-mime";
-          rev = "d540da37df26c673b83cc9aab36f2ca6cfed3481";
-          sha256 = "0fcq75cjvd0fh7ic0j28ly40i95clgn5i7j1sj5infycqkrj87xc";
+          rev = "c0e99cfdfa645300a0c114fa6825efdf797da7c0";
+          sha256 = "1rk7w0qsa824sfm1f3djg7vr6kxnvz3znn6vrzb9kcsmrf1y3k2z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
@@ -50600,12 +50642,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20170501.940";
+        version = "20170509.1755";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "3271a5b4a26f69ab8ee7e7fbe87a24d13c48bf3f";
-          sha256 = "1mp5fr9qrgqif8ax0frq855jzxcyqrdxwa6a63irgf2ik7yv3986";
+          rev = "c730314d51594191e5e761d087d7d5d5c4d7a5a6";
+          sha256 = "0bcagkwzzaawm4lc93dnysjc8ccqnrchywsnixvv6rsc6b7s4q61";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -52269,12 +52311,12 @@
     package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-build";
-        version = "20170429.225";
+        version = "20170506.1759";
         src = fetchFromGitHub {
           owner = "melpa";
           repo = "package-build";
-          rev = "0cb81955bb3933ff0c39a488e9a4b3540ee918a7";
-          sha256 = "06gc0ha2aaj20z5rlbn19z4j57l0xc46a3285kqwa5xk3jnk3213";
+          rev = "940c991ccd0dab53bd7c120601b3db35669c5e73";
+          sha256 = "18yr4qq3jyf9zhlwqrbfq616svsgn5spnj0s4gsni7kb2ijjh2bp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build";
@@ -52895,12 +52937,12 @@
     parsec = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "parsec";
-        version = "20170219.1442";
+        version = "20170508.1500";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "parsec.el";
-          rev = "45046868fb2d5f3c914f2e3b67fbe15033c93532";
-          sha256 = "07brvf6wcnvwz3y29gxk2yckgcg59898s1dhr3jfsnsq0nxam2ix";
+          rev = "8755c60826efaa8603b0d4300bfba9abaa072584";
+          sha256 = "03yzs4l53j4fvviqfhdn3cxc710yrg4wdbnl7r69yn69r4di9bfj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/248aaf5ff9c98cd3e439d0a26611cdefe6b6c32a/recipes/parsec";
@@ -53753,12 +53795,12 @@
     persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persp-mode";
-        version = "20170419.1022";
+        version = "20170509.829";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "3e45de29ea6ef0431df65db18f4a73615c409dfb";
-          sha256 = "1acjxyyxl06b45clg7z1mqm6qpa0rmvnbh5rqx0wizrjp96xls99";
+          rev = "a33c91e3738996c058841ed1985c67bedd4875e1";
+          sha256 = "10ycv3yb5xav7wslf1swcmbn9w2an5izkca8crmdgr566h9mk0gb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -54719,12 +54761,12 @@
     plain-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "plain-theme";
-        version = "20170114.1146";
+        version = "20170505.800";
         src = fetchFromGitHub {
           owner = "yegortimoshenko";
           repo = "plain-theme";
-          rev = "43fc59d487d39e6110230a073f1376ab877aa739";
-          sha256 = "0g44qdpn3ni291awjklia4r26qyiavpjib04k761hfacrdkvsdys";
+          rev = "1e484668cf272ab1883cb3c1ad9e1e8639de395d";
+          sha256 = "0qhr8mch5fvy5gck5prradlrnx84h6n8nvrcqk6ynqd1nh0pnnzd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme";
@@ -55011,8 +55053,8 @@
         version = "20170419.303";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/gettext.git";
-          rev = "cde62682dfd40070308af1c2b484a204977e1fa6";
-          sha256 = "0rpah9ljgs15szf6ndg6nj76xx5bzh4cski4bsqa55kbv2k9kd3w";
+          rev = "3531b829b30803bab9e0d9ff62747e061145fec5";
+          sha256 = "107pc3hdarwv7x7mb8dgc79ldl59r09mwrrw9vcsxqnd2w1jbmca";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode";
@@ -55088,6 +55130,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    point-pos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "point-pos";
+        version = "20170421.932";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "point-pos.el";
+          rev = "442bccb40791832cbc2d6f5c8f53be745aea2b73";
+          sha256 = "1p56h8ipgrd5433pc641xccdnsni51l58ll0hv2rp9aqjg9nlgcr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/23a1e835155fba51f595c10c46487a4c269f43ff/recipes/point-pos";
+          sha256 = "1zv6hx8i8jwq52j4la1ff0ar0bpbs2pb4gcsh9hypghba11gnync";
+          name = "point-pos";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/point-pos";
+          license = lib.licenses.free;
+        };
+      }) {};
     point-stack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "point-stack";
@@ -56450,8 +56513,8 @@
         src = fetchFromGitHub {
           owner = "chuntaro";
           repo = "emacs-promise";
-          rev = "7adac1f8e87d69b3d328add8db396f73254a4303";
-          sha256 = "0xaa54plzlr894j3bp78c9nf8fqwgjscvdrrirh581ff772gx26z";
+          rev = "d3cad4e1f7825404828cd9f5b887f18d3fd83c56";
+          sha256 = "1cn1xcp6yfxp642yibknngf456v29s2qq3y8bsc67ydxjkr5w4gz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3eaf5ac668008759677b9cc6f11406abd573012a/recipes/promise";
@@ -56576,8 +56639,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "a64497c709aa8a08f146334afdadf430a1a5c114";
-          sha256 = "1mszq5s8khfk2il55jj0w128h76zcc1mrbsq7xk8n3dj0fna080h";
+          rev = "455b61c6b0f39ac269b26969877dd3c6f3e32270";
+          sha256 = "091xxj46nckd4vxg34bsv1283s8l4fa9jhamz6jvxy7br6ajslna";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -57420,12 +57483,12 @@
     python-docstring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-docstring";
-        version = "20170314.43";
+        version = "20170508.156";
         src = fetchFromGitHub {
           owner = "glyph";
           repo = "python-docstring-mode";
-          rev = "6ac0b4cab3beb7cb8923f2b273526183179ccf86";
-          sha256 = "0vhhni9wxcwdv7lfdp12a223dvn5w3i5y62cv0gmlsgcr9qdy3cq";
+          rev = "d35d2e0fbe468743c19a870fec7b28a7e725790d";
+          sha256 = "11y208svg5nxw8k7cbgd2iydng40gwpr85bdnxkywd910sac5p7b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e159e59ba0b60326cca0e1ea68fac4b85d54cd24/recipes/python-docstring";
@@ -57483,12 +57546,12 @@
     python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-mode";
-        version = "20170429.55";
+        version = "20170507.953";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "d6a3bde1d79dc0507a7ad14508c07425ca283277";
-          sha256 = "1zdvpq5ngx6n277r7xm5wyzfmpgpvsz0ilp865xdhkj2c3dyd2zw";
+          rev = "08012d66ea2d678795a766d227b74405e73e1267";
+          sha256 = "1mkbzs2jqhdqr4rn1plmh06pzy3kghlwci47mhac4dpx0wbkmw13";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -58218,12 +58281,12 @@
     rats = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
     melpaBuild {
         pname = "rats";
-        version = "20160315.1145";
+        version = "20170505.245";
         src = fetchFromGitHub {
           owner = "ane";
           repo = "rats.el";
-          rev = "a5c519b88455a8eacd5e3b72286c96dfc484479d";
-          sha256 = "0dd9yhxwwk16xkwld9c3hpf9bw8zzc1lyvisp0vn6vcd240j02w0";
+          rev = "40aee473d369cd27593cb7709f4792d1006ca8f7";
+          sha256 = "0aqs4xja66iwbk39m8w2dm9lcisvjkwym65vinj2ywnp5mkr6jg6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a62cbae1b2d9af2322bb6a27949de8c8bfddc2b7/recipes/rats";
@@ -59787,12 +59850,12 @@
     rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "rg";
-        version = "20170415.938";
+        version = "20170506.2235";
         src = fetchFromGitHub {
           owner = "dajva";
           repo = "rg.el";
-          rev = "44eca47f049b25bd45e8cbc7e6579911e552b88a";
-          sha256 = "0riv5cr5sy37pcwvg0yjwi3qkvqr081503j487mcc7dcyvwlcrzy";
+          rev = "261ed756377285f0f8941b7a33866ef538465d74";
+          sha256 = "1fs367w5695v8kvwka1w9kykgpq3qp1209cxkxs096rlkxhbdvv5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@@ -60123,12 +60186,12 @@
     rpn-calc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "rpn-calc";
-        version = "20170402.1833";
+        version = "20170508.100";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "rpn-calc";
-          rev = "4d8aa137b31392a76a0fd4eaf676291029c1aad9";
-          sha256 = "0m373xzxx6ywrxll0qqsnyx55bfp0phbw6mcczz53yw9kpf3mf22";
+          rev = "ae4bf0dd8a922ea41b228fac81dee2c10b11982a";
+          sha256 = "03kvrvafwm7czg8jb4r9wggrabczdd809wr2g62z1wqjiz94fxnp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/47d5b3c931cdbc2351e01d15e2b98c78081c9506/recipes/rpn-calc";
@@ -60186,12 +60249,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20170501.2337";
+        version = "20170509.2255";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "298ba7caa775089e2e4a95612c5f2b0eacbe4414";
-          sha256 = "14s5y1hsp9gr6llla8jpg3sk0lazs2a3sgkmg1lmbg3xr59lcwaz";
+          rev = "2abdfb2adf24b881cdd04e904ecb341bb51e8cb6";
+          sha256 = "11f9sd8w7qqhfd6mxbihlc6mdki4lqyk4dwbi3v91k9hbxb9hlq2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -60252,7 +60315,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "58552";
+          rev = "58657";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -60333,7 +60396,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "58552";
+          rev = "58657";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -60938,12 +61001,12 @@
     sayid = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sayid";
-        version = "20170502.913";
+        version = "20170509.1215";
         src = fetchFromGitHub {
           owner = "bpiel";
           repo = "sayid";
-          rev = "b44b6d346604f8d1ef9b9180be359ce1e601a298";
-          sha256 = "0ggk60l132qgscgqbx4fdhzx6nlv2k7gbrjapkdl15slz2kyq03d";
+          rev = "20a92323c3edc060c521aa93edab9dad47646b4f";
+          sha256 = "0h0wn5c1n2y3cyslz3kbhksvwy1rnwvb1995949b6qkkzwf0cb4l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd2e05f9c9328d8f9ae434c86697a4a04af8b0d/recipes/sayid";
@@ -60959,12 +61022,12 @@
     sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sbt-mode";
-        version = "20170427.1535";
+        version = "20170508.1";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-sbt-mode";
-          rev = "6f2cedfd07d2fa68b12bc435f9f30b32b8d9d2b0";
-          sha256 = "1jaxaxjd6jzmzz49f1z1prjardql6nqbrgk3hbmfqshvlm6hq344";
+          rev = "1ab82c187c49440b08fc468957fa10b79ac603b8";
+          sha256 = "1pwi6i5q7fzvx8ychg2i0ndn2czhrl8fr86695vh99wmy7shvw6i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode";
@@ -60984,8 +61047,8 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "ddef3d169aa0f9cf7a7fd058ae2cf44a313b54cb";
-          sha256 = "1k5ii287vgp26xccais6qqlk0kr7rbz17nhciy691w0d247zvbff";
+          rev = "ec1c3fd61152f119cb6bd7efeef4816bea8f8e65";
+          sha256 = "00lvh1ix9xs9844mp1yz1gfwx8wi53jzgy4wrg8vgwwbd5mrkdvw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -63110,12 +63173,12 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20170430.750";
+        version = "20170504.629";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "52c55f3ab9818f09849a27edf57653672779f681";
-          sha256 = "1z4c8aghp33q1rwydknqqcs68svp3hr77399ng7rqdlkdxfhrbj6";
+          rev = "5bd003364f0de8737cedfacb0766da0dd6e3496f";
+          sha256 = "12cwpra9jgixab54pd7pb7g073b5gbhmsjbhfnnk38yqlgdrzisc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -64772,12 +64835,12 @@
     spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spaceline }:
     melpaBuild {
         pname = "spaceline-all-the-icons";
-        version = "20170503.209";
+        version = "20170506.408";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "spaceline-all-the-icons.el";
-          rev = "40e382659b8a41838274cfaca5001616648fabdd";
-          sha256 = "1i3n0ndgfps0mrvgqkskljwzaflqbvb1a96678m314bfvv64w0ba";
+          rev = "481329d1d1c4c505a91b7f2ac231f77a19e2c74d";
+          sha256 = "15snhm5rq0n31g9hk5gzimhjclfll67vi7avhrhd9z9x6dvq0sp4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
@@ -65523,12 +65586,12 @@
     ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-config-mode";
-        version = "20170413.918";
+        version = "20170506.2330";
         src = fetchFromGitHub {
           owner = "jhgorrell";
           repo = "ssh-config-mode-el";
-          rev = "ff82fd1e48a8fde61c845eb213584d67e754e8a1";
-          sha256 = "1p1kplnkpnhi28fj3j8f5f0v0kccgmx5knyxr2kwn1fq7s9zqbh8";
+          rev = "2d47d28a527d2e5a6aa350ef5f50e0c05378ad35";
+          sha256 = "0x8153ps266b359ll15w792qzqzpqs0jllc006jd59n71frdi8zv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/750b16ee631b4c2014f2ebf767609bab4b8ee421/recipes/ssh-config-mode";
@@ -65544,12 +65607,12 @@
     ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-deploy";
-        version = "20170423.2332";
+        version = "20170506.932";
         src = fetchFromGitHub {
           owner = "cjohansson";
           repo = "emacs-ssh-deploy";
-          rev = "56da852dd3b34add0b2cce499cb07f076767a976";
-          sha256 = "14c8grlbjymdcvkpw6fv80qd9b3l3kmji4xqqh9z2hdvifn412a3";
+          rev = "6d1c10c2b5bb8a1a1f30ab3850970c731ff54086";
+          sha256 = "09bmvgvkhn3cg8lwav77zvsfp5kr3vh6b1mg7cay7jw4m6cjscx4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@@ -65653,8 +65716,8 @@
         src = fetchFromGitHub {
           owner = "lueck";
           repo = "standoff-mode";
-          rev = "a1bea7231a6d25fc05f88c9af588538fea664caa";
-          sha256 = "0cxnph1n1f77xhdafl5glmgqysg89k4lk2fy8384gbyhamfj95v4";
+          rev = "cecb6bb0bbb3692ab9179376d88d14327965a43b";
+          sha256 = "01fdv5v8hlckqdsjq5m4cvghq7mvcwh4mqv49mh2dlahs5m055dk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/98858a45f72c28eec552b119a66479ea99b60f93/recipes/standoff-mode";
@@ -66731,8 +66794,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "3a00c5a18da3547983e29be496e538a7130f85fb";
-          sha256 = "0j1d2zbjj527bs6igmnibjyfkb84icgdwkablp2jpafwpxi8jpgh";
+          rev = "f565f76dfb3a31becc32c807916c011cde6c4e64";
+          sha256 = "1dl39b4c7jij0gxdri2li6nkm7x73ljhbk0n1zwi6lw4xd7dix6p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -67504,8 +67567,8 @@
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "tawny-owl";
-          rev = "de9ac4ab45d311fc9f5bf2d7fde73178f4562731";
-          sha256 = "1j2kf4jp3iyafmp75da80a4s99d5l0svf53lwbqa8k66q9k9nhzh";
+          rev = "c2ed2499796b91c31f249211717e18f475334404";
+          sha256 = "0q34k4mnd7hkgm9p0q7b8x8j5p3dllm5xxhjbadm6mlygr6wx3bj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode";
@@ -67672,8 +67735,8 @@
         src = fetchFromGitHub {
           owner = "dbordak";
           repo = "telephone-line";
-          rev = "85d25085ef958559f37bbe19c68762c725ae2759";
-          sha256 = "1adwngyv2al9pnzs36227bj7340jby846nay101dafc25alcnj4f";
+          rev = "d0428bbd5c308b7c249359be8c854fe80a2905a8";
+          sha256 = "1zr4c63jmjd4lmbrp975c92wh9nn7861dkf5q7mjsglfdf0zp1wj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line";
@@ -67791,22 +67854,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    term-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    term-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "term-plus";
-        version = "20160404.355";
+        version = "20170508.1717";
         src = fetchFromGitHub {
           owner = "tarao";
           repo = "term-plus-el";
-          rev = "f4a8c3aa616f21fa0b4381874149db3cf4e3a360";
-          sha256 = "0ca82vj61inn41xzk36a91g73gpg38nya4r9ajc2ldjqa5z1zdj8";
+          rev = "c3c9239b339c127231860de43abfa08c44c0201a";
+          sha256 = "1mpv9vvvl1sh35vsa5415rvdv57mmbfix8s435q676zvhz3nl8yx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/term+";
           sha256 = "12lvfspqmyrapmbz3x997vf160927d325y50kxdx3s6p81r7n2n8";
           name = "term-plus";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/term+";
           license = lib.licenses.free;
@@ -67945,8 +68008,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "0ee21b6f46c4e9c0a5678f7bc6c4b77d1b6f7876";
-          sha256 = "15alrx83laf5ykgd8d0xk699hlll0b776pir1pzrwdgblcs1y9lz";
+          rev = "a1cf72d9e2ed32ac3c75583cd9db75c5f981382d";
+          sha256 = "08njp03bcihb28sx0n5ngp8xsbc9pdsvc18h0k4c3vybvv3km88n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
@@ -67966,8 +68029,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "0ee21b6f46c4e9c0a5678f7bc6c4b77d1b6f7876";
-          sha256 = "15alrx83laf5ykgd8d0xk699hlll0b776pir1pzrwdgblcs1y9lz";
+          rev = "a1cf72d9e2ed32ac3c75583cd9db75c5f981382d";
+          sha256 = "08njp03bcihb28sx0n5ngp8xsbc9pdsvc18h0k4c3vybvv3km88n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
@@ -68463,8 +68526,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "19baeefd8c38d62085891d7956349601f79448b3";
-          sha256 = "03sfqcxgvg68y16pygxsgpl5dj7yfr0abyjhlraxq3qlc8bcy1rb";
+          rev = "224c334e50a553504385dd001dadf31f7346b30a";
+          sha256 = "0xhpal5a8kap5ngn6p22i6ww1ha1d1yg44a47jfkgfbwx1fmykmj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -68521,12 +68584,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20170428.1227";
+        version = "20170509.1134";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "26f6645c1de8c94d8c41755580abe3cb39ee749f";
-          sha256 = "1x9nwg4zv0ng65a3gndgpkj0mal38j9bgsjcvz4fs6la8a6bidy2";
+          rev = "5f52ed822a80d140a3dc1ce993d75d301c24bf78";
+          sha256 = "15h1fvm17bw9mjx1pvasr99cmjqhlfhy9m6a9ws0r1il7fkwhnl1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -69308,8 +69371,8 @@
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "9d68903018f255838b51c734015be74bbdbf539c";
-          sha256 = "0iddz0m7p7bfnly33gwi8vmpz0lv026lj4val1x584hqix6xk8vh";
+          rev = "1e90e5a89d07bd1584e990c35f5a9d564334a1ae";
+          sha256 = "13pv21bk4khq97a7km7gpj8rmwkmcb1y1nk72w35b9kipxv76vg2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking";
@@ -69701,12 +69764,12 @@
     tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tuareg";
-        version = "20170221.1141";
+        version = "20170508.930";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "f242fe45dc47aab8fe69392304ebc2c779c411e0";
-          sha256 = "07lz7s7z913h0mvmjnvvg9m36pc5r9nrg1a6z2wxszbccjvkz95b";
+          rev = "d1a7ce84c51a3dc5639ebb643bd7557a55c91f76";
+          sha256 = "056hdzh1kgy33s7pnqn59jwhrs5fqh8rzsxq4h3spadyyga33k36";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -69782,6 +69845,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    turing-machine = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "turing-machine";
+        version = "20170505.804";
+        src = fetchFromGitHub {
+          owner = "therockmandolinist";
+          repo = "turing-machine";
+          rev = "41e367e54fbeff572f599f2f321ffc863601484e";
+          sha256 = "0qlm7y3pm8sfy36a8jc3cr955hqsmypzshbgxfnmcmz7wl96dplh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a003b40a52a92b3ab4d1ffc003f570d4fa6bfbde/recipes/turing-machine";
+          sha256 = "1ndy953q9hr1psqqkkqsffyvj800cnqdxcrixqiw0ls77f2kczcn";
+          name = "turing-machine";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/turing-machine";
+          license = lib.licenses.free;
+        };
+      }) {};
     turkish = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "turkish";
@@ -70159,12 +70243,12 @@
     ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ujelly-theme";
-        version = "20170430.1443";
+        version = "20170506.941";
         src = fetchFromGitHub {
           owner = "marktran";
           repo = "color-theme-ujelly";
-          rev = "0bfbef56427f077a6630c803d312a82dc1743550";
-          sha256 = "0wgzn1wlyiqb0bz2wrzh5pv5ljgqg99x7vc6pzr106ia13ccvpnp";
+          rev = "148a173441e7371a01382446d683bfb251f00cc7";
+          sha256 = "05bp1szqrbqh4hvd4gmhk9hfmki0xhib7z762bd4jabh6k68kap7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme";
@@ -70753,12 +70837,12 @@
     use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "use-package";
-        version = "20170405.1028";
+        version = "20170509.1157";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "0139f85595a10b9e50e38f3d8d59f70cf4f3a2a2";
-          sha256 = "1zv2an1mzks51j46j2gvizjmh7k5frzw7qja9kh9lvighl2qrg2v";
+          rev = "54ce52604477c237b663a02d49be9d6d307d49bd";
+          sha256 = "1rpyfbh0zp6a013nva2b1czis10mr8vzv52qlhgcfm78m48bvhya";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
@@ -70795,12 +70879,12 @@
     utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "utop";
-        version = "20170423.2354";
+        version = "20170508.2343";
         src = fetchFromGitHub {
           owner = "diml";
           repo = "utop";
-          rev = "6759d18811e5ad12fb9e609f55da4a27b80f0133";
-          sha256 = "0ai77jc7ys4s8aqaks69i7sj1s2ig9chlm2b6lb0czhwrxjkzhr1";
+          rev = "ea49d8e947e1cd5deeec813e78eba92ff5c6ff3b";
+          sha256 = "17x6bbflqicwk489mkwsqqkb97nriqbgv5shp8p87p7ykkpiw21d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
@@ -71299,12 +71383,12 @@
     vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }:
     melpaBuild {
         pname = "vhdl-tools";
-        version = "20170424.659";
+        version = "20170508.735";
         src = fetchFromGitHub {
           owner = "csantosb";
           repo = "vhdl-tools";
-          rev = "9b6b9f20004dd33c5b603e09b5ca133bc864d1a4";
-          sha256 = "0blgbrbp5bkrcl0dpfwp8akcdgx9ng730kk2lr3g2rzr5v7y8dck";
+          rev = "282274b319f2c3598ac6bbdd27a8b7ca40b0bb0e";
+          sha256 = "0va5aqij3gan3j37jjhx8a8bv0zdpid5x18jfynzizlyk68fc196";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools";
@@ -72238,12 +72322,12 @@
     web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20170501.1032";
+        version = "20170510.1127";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "c658359e80e6ba07f09aa72c5d8572039152857a";
-          sha256 = "1gjbm4qzvd0sl44278s4wa96xk7bg0m02mj5bnlmjds9a73lkb0b";
+          rev = "2ed2b26348326e3bf814fff6f3bca8440b4b7416";
+          sha256 = "18j0j5wq3ria0bllf6nfw97j4am1h2x51gxfn42hgdp027jdfn3j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -72343,12 +72427,12 @@
     webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, request }:
     melpaBuild {
         pname = "webpaste";
-        version = "20170503.105";
+        version = "20170510.1052";
         src = fetchFromGitHub {
           owner = "etu";
           repo = "webpaste.el";
-          rev = "dab97dd11b0e5886c4c401fff917474ee757c2aa";
-          sha256 = "0m1vzi5gall015jps7gcfd3c27vr1sahssa0fm5rgmiqwxidcz7j";
+          rev = "f0a36e24cab482e3f33a9a70103f600b478f9c79";
+          sha256 = "0kb2485sb6p9sfj1fh9dkw7vhss8pp3l95sys1h25rklinjb8hkq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@@ -72679,12 +72763,12 @@
     whitespace-cleanup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "whitespace-cleanup-mode";
-        version = "20150603.447";
+        version = "20170505.1923";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "whitespace-cleanup-mode";
-          rev = "cdc6ee4e33b9e637afabf2075198c5616a44f91f";
-          sha256 = "1j6gh435r52p8kjnzqwbnkynmdq541clwxlnzpsjw8n5mspp7g25";
+          rev = "d375bfb61cb70947a93004cba8ea17a0bc76f5a9";
+          sha256 = "0w6jwg1lyz0hwkhbx3kx6yddakff6azj2ipyxw26rv886gx8a226";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b461cfe450d7ce6bd0c14be3460cacffc1a32e6f/recipes/whitespace-cleanup-mode";
@@ -72807,8 +72891,8 @@
         src = fetchFromGitHub {
           owner = "foretagsplatsen";
           repo = "emacs-js";
-          rev = "77d18cf8fcd5a87139650a645d50e71db0ab5712";
-          sha256 = "0l6qr5dy6h7p5kdyyygrc4ss50sw7h6fi442dig6la8978jqsli8";
+          rev = "74daf284e32bf84d29377d1d7a638b640ebf8f76";
+          sha256 = "0rx05is17g255gymyp6lvsskg5i6c4s28q89kbspdyfwx3rr42qa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -73806,12 +73890,12 @@
     xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20170429.2232";
+        version = "20170510.31";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "775f8822018a414b993996718a1e20b77b5b106c";
-          sha256 = "1v7bw4bf8ghgbqcabiv9iy9wyb99ynic95xm8zs2w8scj508yaph";
+          rev = "db24e037b4d24b848cfceb4be058d973dcb9b569";
+          sha256 = "053yn6i0hcmyz6h8nfknhw4qrsdgz9jiblqxc7v5i81a6ng93mjk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -74602,12 +74686,12 @@
     yapfify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yapfify";
-        version = "20161202.1055";
+        version = "20170504.2218";
         src = fetchFromGitHub {
           owner = "JorisE";
           repo = "yapfify";
-          rev = "c22db3683133ed4aff78e280983ec0621ca1cf1f";
-          sha256 = "05nilm9adpymx1gs1qvcrrgyv13vf5lm13rp12ljbndk0gx4n8x6";
+          rev = "6bc89053a100f09f0568f67f3d47a3f94c392df2";
+          sha256 = "0mg94x6kx6wsql0r12pasb84dhq23gpzgk3n8i09w4qyjajhf20y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/060c32d8e9fdc56fe702d265a935d74d76082f86/recipes/yapfify";
@@ -74748,11 +74832,11 @@
       }) {};
     yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "yatex";
-        version = "20170306.55";
+        version = "20170503.1833";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "7bf780961390";
-          sha256 = "19nxjabwr3c5sjii2pwlgak751wq9h12yp7xd6nz8i6f75md59xs";
+          rev = "428584533eab";
+          sha256 = "1nrvlziqfsyvsk09ynpww99z4vb8zv8h2jxsslvx1nm1shyn2ckh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
@@ -74810,12 +74894,12 @@
     ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }:
     melpaBuild {
         pname = "ycmd";
-        version = "20170501.2313";
+        version = "20170509.2303";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "4c3dad6229d6c2b628490c599b53cdc707531659";
-          sha256 = "1iyq7njhc1kjj9gkpy958dd4vkwzkr2b31bvv97sj2l1lhg63gwd";
+          rev = "05f0409fb7902daf49b4cd329e5c9ef569d77689";
+          sha256 = "0mp05xsphbidjgskp2pnv2x54z95dzmvfwdddpgmysmc99sz305y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -75070,12 +75154,12 @@
     zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "zerodark-theme";
-        version = "20161212.1151";
+        version = "20170505.439";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "zerodark-theme";
-          rev = "c7e4d3aa3062aa6c89408720e5b68856a39cd401";
-          sha256 = "0yqb9wbq4ava9i02skyvjh6n1gd9lcp7lz1a2skzihc2hmnjw2jg";
+          rev = "60615d101769694038b17a2c75bb31c26f36a042";
+          sha256 = "09fpyhprmavv1fa97wa7lf182nhiw0797rh73xbhf7xhn1c22gbj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";

From e22ccad978eb1331360331eaa45f7ce41a44806a Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Fri, 13 Jan 2017 15:00:49 -0500
Subject: [PATCH 44/84] salt: Add minion service module

---
 nixos/modules/module-list.nix                |  1 +
 nixos/modules/services/admin/salt/minion.nix | 52 ++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 nixos/modules/services/admin/salt/minion.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index a76df76f40c..15d7caed38a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -130,6 +130,7 @@
   ./security/wrappers/default.nix
   ./security/sudo.nix
   ./services/admin/salt/master.nix
+  ./services/admin/salt/minion.nix
   ./services/amqp/activemq/default.nix
   ./services/amqp/rabbitmq.nix
   ./services/audio/alsa.nix
diff --git a/nixos/modules/services/admin/salt/minion.nix b/nixos/modules/services/admin/salt/minion.nix
new file mode 100644
index 00000000000..150e2ffa403
--- /dev/null
+++ b/nixos/modules/services/admin/salt/minion.nix
@@ -0,0 +1,52 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+
+  cfg  = config.services.salt.minion;
+
+  fullConfig = lib.recursiveUpdate {
+    # Provide defaults for some directories to allow an immutable config dir
+    # NOTE: the config dir being immutable prevents `minion_id` caching
+
+    # Default is equivalent to /etc/salt/minion.d/*.conf
+    default_include = "/var/lib/salt/minion.d/*.conf";
+    # Default is in /etc/salt/pki/minion
+    pki_dir = "/var/lib/salt/pki/minion";
+  } cfg.configuration;
+  configDir = pkgs.writeTextDir "minion" (builtins.toJSON fullConfig);
+
+in
+
+{
+  options = {
+    services.salt.minion = {
+      enable = mkEnableOption "Salt minion service";
+      configuration = mkOption {
+        type = types.attrs;
+        default = {};
+        description = "Salt minion configuration as Nix attribute set.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [ salt ];
+    systemd.services.salt-minion = {
+      description = "Salt Minion";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      path = with pkgs; [
+        utillinux
+      ];
+      serviceConfig = {
+        ExecStart = "${pkgs.salt}/bin/salt-minion --config-dir=${configDir}";
+        LimitNOFILE = 8192;
+        Type = "notify";
+        NotifyAccess = "all";
+      };
+    };
+  };
+}
+

From 97c613c5129742a325b2bb3fb355507ebefc4850 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 11 May 2017 12:14:41 +0800
Subject: [PATCH 45/84] minikube: 0.18.0 -> 0.19.0

---
 pkgs/applications/networking/cluster/minikube/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 9d17443ac88..8779fbf2028 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -22,7 +22,7 @@ let
 in buildGoPackage rec {
   pname   = "minikube";
   name    = "${pname}-${version}";
-  version = "0.18.0";
+  version = "0.19.0";
 
   goPackagePath = "k8s.io/minikube";
 
@@ -30,7 +30,7 @@ in buildGoPackage rec {
     owner  = "kubernetes";
     repo   = "minikube";
     rev    = "v${version}";
-    sha256 = "0r8184xfsw7vvvmzhc18si582q41cnzka4ry151hwy56gmp2jyiw";
+    sha256 = "060zl5wx9karl0j1w3b1jnr6wkr56p3wgs75r6d5aiz36i8fkg8m";
   };
 
   # kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly

From c684c0e82d3af41127e786542bc90221f8cc805a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Fri, 3 Mar 2017 09:41:14 +0800
Subject: [PATCH 46/84] mu: add checkInputs

---
 pkgs/tools/networking/mu/default.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index 0fc6d7273ea..33db7b1caba 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -1,15 +1,17 @@
-{ fetchurl, stdenv, sqlite, pkgconfig, autoreconfHook, pmccabe
+{ stdenv, fetchFromGitHub, sqlite, pkgconfig, autoreconfHook, pmccabe
 , xapian, glib, gmime, texinfo , emacs, guile
 , gtk3, webkitgtk24x, libsoup, icu
 , withMug ? false }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.18";
   name = "mu-${version}";
+  version = "0.9.18";
 
-  src = fetchurl {
-    url = "https://github.com/djcb/mu/archive/${version}.tar.gz";
-    sha256 = "0gfwi4dwqhsz138plryd0j935vx2i44p63jpfx85ki3l4ysmmlwd";
+  src = fetchFromGitHub {
+    owner  = "djcb";
+    repo   = "mu";
+    rev    = version;
+    sha256 = "0zy0p196bfrfzsq8f58xv04rpnr948sdvljflgzvi6js0vz4009y";
   };
 
   # as of 0.9.18 2 tests are failing but previously we had no tests
@@ -19,9 +21,10 @@ stdenv.mkDerivation rec {
 
   # pmccabe should be a checkInput instead, but configure looks for it
   buildInputs = [
-    sqlite xapian glib gmime texinfo emacs guile libsoup icu pmccabe
+    sqlite xapian glib gmime texinfo emacs guile libsoup icu
   ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x ];
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  checkInputs = [ pmccabe ];
 
   doCheck = true;
 
@@ -37,8 +40,9 @@ stdenv.mkDerivation rec {
 
   # Install mug and msg2pdf
   postInstall = stdenv.lib.optionalString withMug ''
-    cp -v toys/msg2pdf/msg2pdf $out/bin/
-    cp -v toys/mug/mug $out/bin/
+    for f in msg2pdf mug ; do
+      install -m755 toys/$f/$f $out/bin/$f
+    done
   '';
 
   meta = with stdenv.lib; {
@@ -46,6 +50,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     homepage = "http://www.djcbsoftware.nl/code/mu/";
     platforms = platforms.mesaPlatforms;
-    maintainers = with maintainers; [ antono the-kenny ];
+    maintainers = with maintainers; [ antono the-kenny peterhoeg ];
   };
 }

From 9394314d7956731f4421d9bc44a65144986fc476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 10 May 2017 20:06:23 +0100
Subject: [PATCH 47/84] xf86-video-intel: 2017-02-05 -> 2017-04-18

---
 pkgs/servers/x11/xorg/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index a4de1ecda43..3e9bc1ba718 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1813,11 +1813,11 @@ let
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videointel = (mkDerivation "xf86videointel" {
-    name = "xf86-video-intel-2017-02-05";
+    name = "xf86-video-intel-2017-04-18";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/e4fe79cf0d9a05ee3f3a027148ef0aeb2b1b34e1.tar.gz;
-      sha256 = "1hzfz5m9iclxk55531nqmyn25a50ggibl1qb80l6742k25k211cr";
+      url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/c72bb27a3a68ecc616ce2dc8e9a1d20354504562.tar.gz;
+      sha256 = "1awxbig135nmq7qa8jzggqr4q32k6ngnal2lckrdkg7zqi40zdv8";
     };
     buildInputs = [pkgconfig dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ];
     meta.platforms = stdenv.lib.platforms.unix;

From d5861fa537f193ecdeb91a747b812193cf680420 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 11 May 2017 13:16:01 +0800
Subject: [PATCH 48/84] wkhtmltopdf: 0.12.3.2 -> 0.12.4

---
 pkgs/tools/graphics/wkhtmltopdf/default.nix | 31 +++++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix
index 24c4f2433c6..b513115c68f 100644
--- a/pkgs/tools/graphics/wkhtmltopdf/default.nix
+++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, qt4, fontconfig, freetype, libpng, zlib, libjpeg
+{ stdenv, fetchFromGitHub, fetchpatch, qt4, fontconfig, freetype, libpng, zlib, libjpeg
 , openssl, libX11, libXext, libXrender, overrideDerivation }:
 
 stdenv.mkDerivation rec {
-  version = "0.12.3.2";
+  version = "0.12.4";
   name = "wkhtmltopdf-${version}";
 
   src = fetchFromGitHub {
     owner  = "wkhtmltopdf";
     repo   = "wkhtmltopdf";
-    rev    = "${version}";
-    sha256 = "1yyqjhxv4dvpkad79scs7xdx4iz8jpyidr9ya86k3zpfyvh4gq3s";
+    rev    = version;
+    sha256 = "09yzj9ylc6ci4a1qlhz60cgxi1nm9afwjrjxfikf8wwjd3i24vp2";
   };
 
   wkQt = overrideDerivation qt4 (deriv: {
@@ -105,14 +105,27 @@ stdenv.mkDerivation rec {
       '';
   });
 
-  buildInputs = [ wkQt fontconfig freetype libpng zlib libjpeg openssl
-                  libX11 libXext libXrender
-                ];
+  buildInputs = [
+    wkQt fontconfig freetype libpng zlib libjpeg openssl
+    libX11 libXext libXrender
+  ];
+
+  prePatch = ''
+    for f in src/image/image.pro src/pdf/pdf.pro ; do
+      substituteInPlace $f --replace '$(INSTALL_ROOT)' ""
+    done
+  '';
+
+  patches = [
+    (fetchpatch {
+      name = "make-0.12.4-compile.patch";
+      url = "https://github.com/efx/aports/raw/eb9f8e6bb9a488460929db747b15b8fceddd7abd/testing/wkhtmltopdf/10-patch1.patch";
+      sha256 = "1c136jz0klr2rmhmy13gdbgsgkpjfdp2sif8bnw8d23mr9pym3s1";
+    })
+  ];
 
   configurePhase = "qmake wkhtmltopdf.pro INSTALLBASE=$out";
 
-  patches = [ ./makefix.patch ];
-
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {

From bd831b4a07fc332854071d47d1382ec689078e85 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 11 May 2017 01:28:44 -0400
Subject: [PATCH 49/84] flamegraph: 182b24fb -> 6b2a446d

Also, add a more predictable alias to all-packages.nix
---
 pkgs/development/tools/flamegraph/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix               | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/flamegraph/default.nix b/pkgs/development/tools/flamegraph/default.nix
index 434348473ef..51bdf772adb 100644
--- a/pkgs/development/tools/flamegraph/default.nix
+++ b/pkgs/development/tools/flamegraph/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation {
-  name = "FlameGraph-2015-10-10";
+  name = "FlameGraph-2017-05-11";
 
   src = fetchFromGitHub {
     owner = "brendangregg";
     repo = "FlameGraph";
-    rev = "182b24fb635345d48c91ed1de58a08b620312f3d";
-    sha256 = "1djz0wl8202a6j87ka9j3d8iw3bli056lrn73gv2i65p16rwk9kc";
+    rev = "6b2a446dfb5d8027a0adf14adf71748aa502c247";
+    sha256 = "11j1776zsvhn9digqay1cbfhhxz01nv2hm44i4gnpqcxkada44l2";
   };
 
   buildInputs = [ perl ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4655c98c2e1..121204c95f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1850,7 +1850,10 @@ with pkgs;
 
   fdk_aac = callPackage ../development/libraries/fdk-aac { };
 
-  flameGraph = callPackage ../development/tools/flamegraph { };
+  flamegraph = callPackage ../development/tools/flamegraph { };
+
+  # Awkward historical capitalization for flamegraph. Remove eventually
+  flameGraph = flamegraph;
 
   flvtool2 = callPackage ../tools/video/flvtool2 { };
 

From 83970f5cbcdb6ba8e7c6d48b6e78441fbd370546 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 11 May 2017 13:45:00 +0800
Subject: [PATCH 50/84] usb_modeswitch: remove unneeded dependencies

---
 pkgs/development/tools/misc/usb-modeswitch/data.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/usb-modeswitch/data.nix b/pkgs/development/tools/misc/usb-modeswitch/data.nix
index a45db5fbcaf..0ad79005d91 100644
--- a/pkgs/development/tools/misc/usb-modeswitch/data.nix
+++ b/pkgs/development/tools/misc/usb-modeswitch/data.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libusb1, tcl, usb-modeswitch }:
+{ stdenv, fetchurl, tcl, usb-modeswitch }:
 
 stdenv.mkDerivation rec {
   name = "usb-modeswitch-data-${version}";
@@ -15,10 +15,9 @@ stdenv.mkDerivation rec {
     sed -i 's@usb_modeswitch@${usb-modeswitch}/bin/usb_modeswitch@g' 40-usb_modeswitch.rules
   '';
 
-  buildInputs = [ libusb1 usb-modeswitch ];
   # we add tcl here so we can patch in support for new devices by dropping config into
   # the usb_modeswitch.d directory
-  nativeBuildInputs = [ pkgconfig tcl ];
+  nativeBuildInputs = [ tcl ];
 
   meta = with stdenv.lib; {
     description = "Device database and the rules file for 'multi-mode' USB devices";

From 408d06f6ec7f4a3538647fb3617f6a8cedcce6b6 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 11 May 2017 14:02:46 +0800
Subject: [PATCH 51/84] terragrunt: 0.12.15 -> 0.12.16

---
 .../networking/cluster/terragrunt/default.nix |  2 +-
 .../networking/cluster/terragrunt/deps.nix    | 29 ++++++++++++-------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index b245b78e10a..4e4c0d3b324 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.12.15";
+  version = "0.12.16";
 
   goPackagePath = "github.com/gruntwork-io/terragrunt";
 
diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix
index b98a38f8352..5ea04d1f424 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 = "c790b8046767d9c773ad83c327ab988312f85a94";
-      sha256 = "0bhk7j088r8hhf05l70gpfnprxk7vzgb1fql9brk065hw2xnplsr";
+      rev = "952498f4a390118ac65ad59cbe0c8b57ed69b6b5";
+      sha256 = "03j2dn4v2wr32jd9iki68ra0r8aghy7hpad94bf8zdgsrjn6rwvj";
     };
   }
   {
@@ -32,8 +32,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/go-getter";
-      rev = "e48f67b534e614bf7fbd978fd0020f61a17b7527";
-      sha256 = "0dlmirfi0pfbwylcjf2mggzav5r7bzdy19m3by6dgarn6izx6g7i";
+      rev = "90b6568eac830f62a08e8f1f46375daa63e57015";
+      sha256 = "1cl0yqlhffjmf4qan093z49i88i7wjp9lsfwfzn52sk3c09ksism";
     };
   }
   {
@@ -50,8 +50,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/hcl";
-      rev = "630949a3c5fa3c613328e1b8256052cbc2327c9b";
-      sha256 = "00lalg0gz7218gnw6zgn28gfizpcl8zw8jpkghn681vj7lfah5dh";
+      rev = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca";
+      sha256 = "1rfm67kma2hpakabf7hxlj196jags4rpjpcirwg4kan4g9b6j0kb";
     };
   }
   {
@@ -72,13 +72,22 @@
       sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
     };
   }
+  {
+    goPackagePath = "github.com/mitchellh/go-testing-interface";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-testing-interface";
+      rev = "477c2d05a845d8b55912a5a7993b9b24abcc5ef8";
+      sha256 = "0llpcyiqfjdri7pba1p13maafgcyzjbd29h99b1hgj848k5avd61";
+    };
+  }
   {
     goPackagePath = "github.com/mitchellh/mapstructure";
     fetch = {
       type = "git";
       url = "https://github.com/mitchellh/mapstructure";
-      rev = "53818660ed4955e899c0bcafa97299a388bd7c8e";
-      sha256 = "10gdkk8gcjv0lg15ajy68dwgvfkjhawk08ccs9x9ym1adp6l2ycs";
+      rev = "cc8532a8e9a55ea36402aa21efdf403a60d34096";
+      sha256 = "0705c0hq7b993sabnjy65yymvpy9w1j84bg9bjczh5607z16nw86";
     };
   }
   {
@@ -95,8 +104,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/urfave/cli";
-      rev = "8ba6f23b6e36d03666a14bd9421f5e3efcb59aca";
-      sha256 = "01s53ny3p0fdx64rnwcnmjj4xpc5adihnh6islsfq5z1ph2phhnj";
+      rev = "d70f47eeca3afd795160003bc6e28b001d60c67c";
+      sha256 = "1xm203qp4sdlvffcbag7v6mc2d6q61i25iiz3y9yqpy25jpcpgif";
     };
   }
 ]

From 8d1bebf83c5f07e30e8c32700d0dfe7fb65008b1 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sun, 7 May 2017 22:31:35 +0200
Subject: [PATCH 52/84] bcftools: 1.3.1 -> 1.4

---
 .../applications/science/biology/bcftools/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix
index 7ae62b15d34..97e081f908e 100644
--- a/pkgs/applications/science/biology/bcftools/default.nix
+++ b/pkgs/applications/science/biology/bcftools/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchurl, zlib, htslib }:
+{ stdenv, fetchurl, htslib, zlib, bzip2, lzma, perl }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "bcftools";
-  version = "1.3.1";
+  major = "1.4";
+  version = "${major}.0";
 
   src = fetchurl {
-    url = "https://github.com/samtools/${pname}/releases/download/${version}/${name}.tar.bz2";
-    sha256 = "095ry68vmz9q5s1scjsa698dhgyvgw5aicz24c19iwfbai07mhqj";
+    url = "https://github.com/samtools/bcftools/releases/download/${major}/bcftools-${major}.tar.bz2";
+    sha256 = "0k93mq3lf73dch81p4zxi0bdll567acxfa81qzbzkqflgsjb1ccg";
   };
 
-  buildInputs = [ zlib ];
+  buildInputs = [ zlib bzip2 lzma perl ];
 
   makeFlags = [
     "HSTDIR=${htslib}"

From ad67c286e1626b44502984b11ac6f866e4fa19b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Thu, 11 May 2017 07:12:04 +0100
Subject: [PATCH 53/84] salt-minion: link to configuration documentation

---
 nixos/modules/services/admin/salt/minion.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/admin/salt/minion.nix b/nixos/modules/services/admin/salt/minion.nix
index 150e2ffa403..9ecefb32cfa 100644
--- a/nixos/modules/services/admin/salt/minion.nix
+++ b/nixos/modules/services/admin/salt/minion.nix
@@ -26,7 +26,11 @@ in
       configuration = mkOption {
         type = types.attrs;
         default = {};
-        description = "Salt minion configuration as Nix attribute set.";
+        description = ''
+          Salt minion configuration as Nix attribute set.
+          See <link xlink:href="https://docs.saltstack.com/en/latest/ref/configuration/minion.html"/>                                                                                                 
+          for details.          
+        '';
       };
     };
   };

From fb0410c208b7669327940f7eaabe2e4865c4f198 Mon Sep 17 00:00:00 2001
From: Sophie Taylor <sophie@traumapony.org>
Date: Thu, 11 May 2017 16:36:00 +1000
Subject: [PATCH 54/84] proofgeneral: 2017-03-13 -> 2017-05-06 (#25695)

---
 .../editors/emacs-modes/proofgeneral/HEAD.nix       | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
index 0f6227a44a3..9e29bb9c4a6 100644
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
+++ b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchgit, emacs, texinfo, texLive, perl, which, automake, enableDoc ? false }:
+{ stdenv, fetchFromGitHub, emacs, texinfo, texLive, perl, which, automake, enableDoc ? false }:
 
 stdenv.mkDerivation (rec {
   name = "ProofGeneral-unstable-${version}";
-  version = "2017-03-13";
+  version = "2017-05-06";
 
-  src = fetchgit {
-    url = "https://github.com/ProofGeneral/PG.git";
-    rev = "62ec846fcaaef8f3ae94302cbef2972f88a0804f";
-    sha256 = "0vln1bc884qynbl5yci0dkr6ckz3p46q4jrhxgylcx4w0jkhizhm";
+  src = fetchFromGitHub {
+    owner = "ProofGeneral";
+    repo = "PG";
+    rev = "574b0992e3cb4b7a4ad88400b9a5ab0198a96ca5";
+    sha256 = "1c1pgdmy58h78s53g0ga9b5ilbsibz0dr2lk52xgbs3q5m22v5fh";
   };
 
   buildInputs = [ emacs texinfo perl which ] ++ stdenv.lib.optional enableDoc texLive;

From 6fef3228f9b7d1ab656f4ba5d7b36ea7b66cd299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20J=C3=B8rgen=20Br=C3=B8nner?= <olejorgenb@yahoo.no>
Date: Thu, 11 May 2017 08:52:43 +0200
Subject: [PATCH 55/84] sgtpuzzles: fix broken gtk3 file dialog (#25694)

include wrapGAppsHook for file dialog to work
---
 pkgs/games/sgt-puzzles/default.nix | 32 ++++++++++++++++--------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix
index 6718b3b0b5e..bb9772dae72 100644
--- a/pkgs/games/sgt-puzzles/default.nix
+++ b/pkgs/games/sgt-puzzles/default.nix
@@ -1,22 +1,25 @@
-{stdenv, gtk3, pkgconfig, libX11, perl, fetchurl, automake115x, autoconf}:
-let
+{ stdenv, fetchurl
+, gtk3, libX11
+, makeWrapper, pkgconfig, perl, autoreconfHook, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+  name = "sgt-puzzles-r${version}";
   version = "20170228.1f613ba";
-  buildInputs = [
-    gtk3 pkgconfig libX11 perl automake115x autoconf
-  ];
-in
-stdenv.mkDerivation {
+
   src = fetchurl {
    url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
    sha256 = "02nqc18fhvxr545wgk55ly61fi0a06q61ljzwadprqxa1n0g0fz5";
   };
-  name = "sgt-puzzles-r" + version;
-  inherit buildInputs;
+
+  nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig perl wrapGAppsHook ];
+
+  buildInputs = [ gtk3 libX11 ];
+
   makeFlags = ["prefix=$(out)" "gamesdir=$(out)/bin"];
   preInstall = ''
     mkdir -p "$out"/{bin,share/doc/sgtpuzzles}
     cp gamedesc.txt LICENCE README "$out/share/doc/sgtpuzzles"
-    cp LICENCE "$out/share/doc/sgtpuzzles/LICENSE"
   '';
   # SGT Puzzles use generic names like net, map, etc.
   # Create symlinks with sgt-puzzle- prefix for possibility of
@@ -33,12 +36,11 @@ stdenv.mkDerivation {
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error"
     cp Makefile.gtk Makefile
   '';
-  meta = {
-    inherit version;
+  meta = with stdenv.lib; {
     description = "Simon Tatham's portable puzzle collection";
-    license = stdenv.lib.licenses.mit ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.mit;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
     homepage = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/";
   };
 }

From 2dcc5bbb5d0aafd1b457e7decca67f5176fc177b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Thu, 11 May 2017 07:57:09 +0100
Subject: [PATCH 56/84] cmark: cmake in nativeBuildInputs

---
 pkgs/development/libraries/cmark/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix
index dceb042732d..16c3e28f248 100644
--- a/pkgs/development/libraries/cmark/default.nix
+++ b/pkgs/development/libraries/cmark/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1da62ispca9aal2a36gaj87175rv5013pl7x740vk32y6lclr6v6";
   };
 
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
 
   meta = {
     description = "CommonMark parsing and rendering library and program in C";

From cd8088be258487fb904ef2d2953f5768d03a6c8f Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 11 May 2017 15:06:54 +0800
Subject: [PATCH 57/84] tnef: clean up

---
 pkgs/applications/misc/tnef/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/applications/misc/tnef/default.nix
index 604c9f59e60..6ed6cc37fa0 100644
--- a/pkgs/applications/misc/tnef/default.nix
+++ b/pkgs/applications/misc/tnef/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchFromGitHub, lib, autoreconfHook }:
+{ stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   version = "1.4.14";
   name = "tnef-${version}";
 
   src = fetchFromGitHub {
-    owner = "verdammelt";
-    repo = "tnef";
-    rev = "${version}";
+    owner  = "verdammelt";
+    repo   = "tnef";
+    rev    = version;
     sha256 = "0p7yji5hqq7k4pcba1cnv4jkl0fkg7jd77c1q164wk0vwinpmsc2";
   };
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Unpacks MIME attachments of type application/ms-tnef";
     longDescription = ''
       TNEF is a program for unpacking MIME attachments of type "application/ms-tnef". This is a Microsoft only attachment.
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = https://github.com/verdammelt/tnef;
     license = licenses.gpl2;
-    maintainers = [ ];
+    maintainers = [ peterhoeg ];
     platforms = platforms.all;
   };
 }

From 2ef92f0b5a492084da38bc0d6ccf49e401e276da Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 11 May 2017 15:21:16 +0800
Subject: [PATCH 58/84] fix build

---
 pkgs/applications/misc/tnef/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/applications/misc/tnef/default.nix
index 6ed6cc37fa0..63d68bbbea4 100644
--- a/pkgs/applications/misc/tnef/default.nix
+++ b/pkgs/applications/misc/tnef/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = https://github.com/verdammelt/tnef;
     license = licenses.gpl2;
-    maintainers = [ peterhoeg ];
+    maintainers = with maintainers; [ peterhoeg ];
     platforms = platforms.all;
   };
 }

From e2a807cf128f37701a33b88aa1beccb9055aa652 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 11 May 2017 08:35:54 +0100
Subject: [PATCH 59/84] cmark: enable tests

---
 pkgs/development/libraries/cmark/default.nix | 21 +++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix
index 16c3e28f248..5fdd1edfd97 100644
--- a/pkgs/development/libraries/cmark/default.nix
+++ b/pkgs/development/libraries/cmark/default.nix
@@ -1,20 +1,27 @@
-{ stdenv, fetchurl, cmake }:
+{ stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   version = "0.27.1";
   name = "cmark-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/jgm/cmark/archive/${version}.tar.gz";
-    sha256 = "1da62ispca9aal2a36gaj87175rv5013pl7x740vk32y6lclr6v6";
+  src = fetchFromGitHub {
+    owner = "jgm";
+    repo = "cmark";
+    rev = version;
+    sha256 = "06miwq3rl2bighkn6iq7bdwzmvcqa53qwpa0pqjqa8yn44j8ijj8";
   };
 
   nativeBuildInputs = [ cmake ];
+  doCheck = true;
+  checkPhase = ''
+    export LD_LIBRARY_PATH=$(readlink -f ./src)
+    CTEST_OUTPUT_ON_FAILURE=1 make test
+  '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "CommonMark parsing and rendering library and program in C";
     homepage = https://github.com/jgm/cmark;
-    maintainers = [ stdenv.lib.maintainers.michelk ];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ maintainers.michelk ];
+    platforms = platforms.unix;
   };
 }

From 7907fbfde6b27f8d0e545637497fcb54aaefbd9d Mon Sep 17 00:00:00 2001
From: Jens Binkert <jensbin@protonmail.com>
Date: Thu, 11 May 2017 09:51:33 +0200
Subject: [PATCH 60/84] osmo: 0.2.14 -> 0.4.0 (#25622)

---
 pkgs/applications/office/osmo/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix
index 3209ae0a9c9..23ee4da8e01 100644
--- a/pkgs/applications/office/osmo/default.nix
+++ b/pkgs/applications/office/osmo/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, gtk2, libxml2, gettext, libical, libnotify
-, libarchive, gtkspell2, webkitgtk2, libgringotts }:
+{ stdenv, fetchurl, pkgconfig, gtk3, libxml2, gettext, libical, libnotify
+, libarchive, gtkspell3, webkitgtk, libgringotts, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "osmo-${version}";
-  version = "0.2.14";
+  version = "0.4.0-1";
 
   src = fetchurl {
     url = "mirror://sourceforge/osmo-pim/${name}.tar.gz";
-    sha256 = "0vaayrmyiqn010gr11drmhkkg8fkxdmla3gwj9v3zvp5x44kab05";
+    sha256 = "fb454718e071c44bd360ce3e56cb29926cbf44a0d06ec738fa9b40fe3cbf8a33";
   };
 
-  buildInputs = [ pkgconfig gtk2 libxml2 gettext libical libnotify libarchive
-    gtkspell2 webkitgtk2 libgringotts ];
+  nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ];
+  buildInputs = [ gtk3 libxml2 libical libnotify libarchive
+    gtkspell3 webkitgtk libgringotts ];
 
   meta = with stdenv.lib; {
     description = "A handy personal organizer";

From 6c79df351ff0b624ed202a7be6fb57e1be4be353 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 11 May 2017 17:15:27 +0800
Subject: [PATCH 61/84] libkcddb: init at 17.04.0

---
 pkgs/applications/kde/default.nix  |  1 +
 pkgs/applications/kde/libkcddb.nix | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/applications/kde/libkcddb.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 827cb34e22e..a77d3d0b347 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -80,6 +80,7 @@ let
       konsole = callPackage ./konsole.nix {};
       krfb = callPackage ./krfb.nix {};
       kwalletmanager = callPackage ./kwalletmanager.nix {};
+      libkcddb = callPackage ./libkcddb.nix {};
       libkdcraw = callPackage ./libkdcraw.nix {};
       libkexiv2 = callPackage ./libkexiv2.nix {};
       libkipi = callPackage ./libkipi.nix {};
diff --git a/pkgs/applications/kde/libkcddb.nix b/pkgs/applications/kde/libkcddb.nix
new file mode 100644
index 00000000000..3d05714e824
--- /dev/null
+++ b/pkgs/applications/kde/libkcddb.nix
@@ -0,0 +1,18 @@
+{ kdeApp, lib, extra-cmake-modules, qtbase, kdoctools
+, kcodecs, ki18n, kio, kwidgetsaddons
+, libmusicbrainz5 }:
+
+kdeApp {
+  name = "libkcddb";
+  meta = with lib; {
+    license = with licenses; [ gpl2 lgpl21 bsd3 ];
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtbase kdoctools ];
+  propagatedBuildInputs = [
+    kcodecs ki18n kio kwidgetsaddons
+    libmusicbrainz5
+  ];
+  enableParallelBuilding = true;
+}

From b07e04882e325001f23d8c9fa671079ae0e11d5f Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 11 May 2017 17:29:58 +0800
Subject: [PATCH 62/84] k3b: 2.0.3a -> 17.04.0

---
 pkgs/applications/kde/default.nix      |  1 +
 pkgs/applications/kde/k3b.nix          | 41 ++++++++++++++++++++++
 pkgs/applications/misc/k3b/default.nix | 47 --------------------------
 pkgs/top-level/all-packages.nix        |  4 +--
 4 files changed, 43 insertions(+), 50 deletions(-)
 create mode 100644 pkgs/applications/kde/k3b.nix
 delete mode 100644 pkgs/applications/misc/k3b/default.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index a77d3d0b347..81c50147cb6 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -59,6 +59,7 @@ let
       ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
       filelight = callPackage ./filelight.nix {};
       gwenview = callPackage ./gwenview.nix {};
+      k3b = callPackage ./k3b.nix {};
       kate = callPackage ./kate.nix {};
       kdenlive = callPackage ./kdenlive.nix {};
       kcalc = callPackage ./kcalc.nix {};
diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix
new file mode 100644
index 00000000000..d1cd33a5208
--- /dev/null
+++ b/pkgs/applications/kde/k3b.nix
@@ -0,0 +1,41 @@
+{ kdeApp, lib, kdeWrapper, extra-cmake-modules
+, qtwebkit
+, libkcddb, kcmutils, kdoctools, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
+, flac, lame, libmad, libmpcdec, libvorbis
+, libsamplerate, libsndfile, taglib
+, cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager
+, ffmpeg, libmusicbrainz2, normalize, sox, transcode
+}:
+
+let
+  unwrapped =
+    kdeApp {
+      name = "k3b";
+      meta = with lib; {
+        license = with licenses; [ gpl2Plus ];
+        maintainers = with maintainers; [ sander phreedom ];
+        platforms = platforms.linux;
+      };
+      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+      propagatedBuildInputs = [
+        # qt
+        qtwebkit
+        # kde
+        libkcddb kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui
+        # formats
+        flac lame libmad libmpcdec libvorbis
+        # sound utilities
+        libsamplerate libsndfile taglib
+        # cd/dvd
+        cdparanoia libdvdcss libdvdread
+        # others
+        ffmpeg libmusicbrainz2
+      ];
+      enableParallelBuilding = true;
+    };
+
+in kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/k3b" ];
+  paths = [ cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode vcdimager ];
+}
diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix
deleted file mode 100644
index 072685b8194..00000000000
--- a/pkgs/applications/misc/k3b/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, lib, fetchurl, makeWrapper, automoc4, cmake, perl, pkgconfig
-, shared_mime_info, libvorbis, taglib, flac, libsamplerate
-, libdvdread, lame, libsndfile, libmad, gettext , transcode, cdrdao
-, dvdplusrwtools, vcdimager, cdparanoia, kdelibs4, libdvdcss, ffmpeg
-, libkcddb, phonon
-}:
-
-let
-  # at runtime, k3b needs the executables cdrdao, cdrecord, dvd+rw-format,
-  # eMovix, growisofs, mkisofs, normalize, readcd, transcode, vcdxbuild,
-  # vcdxminfo, and vcdxrip
-  binPath = lib.makeBinPath [ cdrdao dvdplusrwtools transcode vcdimager ];
-
-in stdenv.mkDerivation rec {
-  name = "k3b-${version}";
-  version = "2.0.3a";
-
-  src = fetchurl {
-    url = "http://download.kde.org/stable/k3b/${name}.tar.xz";
-    sha256 = "10f07465g9860chfnvrp9w3m686g6j9f446xgnnx7h82d1sb42rd";
-  };
-
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-
-  buildInputs = [
-    shared_mime_info libvorbis taglib flac libsamplerate libdvdread
-    lame libsndfile libmad stdenv.cc.libc kdelibs4
-    phonon libkcddb makeWrapper cdparanoia
-    libdvdcss ffmpeg
-  ];
-
-  enableParallelBuilding = true;
-
-  NIX_CFLAGS_LINK = [ "-lcdda_interface" "-lcdda_paranoia" "-ldvdcss" ];
-
-  postInstall = ''
-    wrapProgram $out/bin/k3b \
-      --prefix PATH ":" "${binPath}"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "CD/DVD Burning Application for KDE";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.sander maintainers.phreedom ];
-    platforms = with stdenv.lib.platforms; linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 121204c95f6..dc617986c67 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14462,9 +14462,7 @@ with pkgs;
     boost = boost155;
   };
 
-  k3b-original = lowPrio (kde4.callPackage ../applications/misc/k3b { });
-
-  k3b = kde4.callPackage ../applications/misc/k3b/wrapper.nix { };
+  k3b = kdeApplications.k3b;
 
   k9copy = libsForQt5.callPackage ../applications/video/k9copy {};
 

From 9498f5ca5faa2299fd23eac6d5ec3fbbe7383deb Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 11 May 2017 18:12:53 +0800
Subject: [PATCH 63/84] krusader: 2.4.0-beta1 -> 2.6.0

Fixes #22952
---
 pkgs/applications/misc/krusader/default.nix | 46 +++++++++++++--------
 pkgs/top-level/all-packages.nix             |  2 +-
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix
index ed74eae46f3..c085d916d86 100644
--- a/pkgs/applications/misc/krusader/default.nix
+++ b/pkgs/applications/misc/krusader/default.nix
@@ -1,21 +1,33 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs4, kde_baseapps
+{
+  kdeDerivation, kdeWrapper, fetchurl, lib,
+  extra-cmake-modules, kdoctools,
+  kconfig, kinit, kparts
 }:
 
-stdenv.mkDerivation rec {
-  name = "krusader-2.4.0-beta1";
-  src = fetchurl {
-    url = "mirror://sourceforge/krusader/${name}.tar.bz2";
-    sha256 = "1q1m4cjzz2m41pdpxnwrsiczc7990785b700lv64midjjgjnr7j6";
-  };
-  buildInputs = [ kdelibs4 kde_baseapps ];
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-  NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions
-  meta = {
-    description = "Norton/Total Commander clone for KDE";
-    license = "GPL";
-    homepage = http://www.krusader.org;
-    maintainers = with stdenv.lib.maintainers; [ sander ];
-    inherit (kdelibs4.meta) platforms;
+let
+  pname = "krusader";
+  version = "2.6.0";
+  unwrapped = kdeDerivation rec {
+    name = "krusader-${version}";
+
+    src = fetchurl {
+      url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz";
+      sha256 = "0f9skfvp0hdml8qq6v22z9293ndijd8kwbpdj7wpvgd6mlya8qbh";
+    };
+
+    meta = with lib; {
+      description = "Norton/Total Commander clone for KDE";
+      license = licenses.gpl2;
+      homepage = http://www.krusader.org;
+      maintainers = with maintainers; [ sander ];
+    };
+
+    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+    propagatedBuildInputs = [ kconfig kinit kparts ];
+    enableParallelBuilding = true;
   };
+
+in kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/krusader" ];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc617986c67..9492ea44560 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14547,7 +14547,7 @@ with pkgs;
     openjpeg = openjpeg_1;
   };
 
-  krusader = kde4.callPackage ../applications/misc/krusader { };
+  krusader = libsForQt5.callPackage ../applications/misc/krusader { };
 
   ksuperkey = callPackage ../tools/X11/ksuperkey { };
 

From 48192c65c3f1398dd8a48e2a0b0fb72c40410dc0 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Fri, 30 Dec 2016 11:54:25 +0800
Subject: [PATCH 64/84] partition-manager: init at 3.0.1

Includes kpmcore 3.0.3
---
 .../development/libraries/kpmcore/default.nix | 31 ++++++++++++++++++
 pkgs/tools/misc/partition-manager/default.nix | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 3 files changed, 67 insertions(+)
 create mode 100644 pkgs/development/libraries/kpmcore/default.nix
 create mode 100644 pkgs/tools/misc/partition-manager/default.nix

diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix
new file mode 100644
index 00000000000..8532a8880ce
--- /dev/null
+++ b/pkgs/development/libraries/kpmcore/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, fetchurl, extra-cmake-modules, pkgconfig
+, qtbase, kdeFrameworks
+, eject, libatasmart, parted }:
+
+let
+  pname = "kpmcore";
+
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  version = "3.0.3";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+    sha256 = "17lqrp39w31fm7haigwq23cp92zwk3czjzqa2fhn3wafx3vafwd2";
+  };
+
+  buildInputs = [
+    qtbase
+    eject # this is to get libblkid
+    libatasmart
+    parted # we only need the library
+
+    kdeFrameworks.kio
+  ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+   maintainers = with lib.maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix
new file mode 100644
index 00000000000..dcea9c47aec
--- /dev/null
+++ b/pkgs/tools/misc/partition-manager/default.nix
@@ -0,0 +1,32 @@
+{ kdeDerivation, kdeWrapper, fetchurl, lib
+, ecm, kdoctools
+, kconfig, kinit, kpmcore
+, eject, libatasmart }:
+
+let
+  pname = "partitionmanager";
+  unwrapped = kdeDerivation rec {
+    name = "${pname}-${version}";
+    version = "3.0.1";
+
+    src = fetchurl {
+      url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+      sha256 = "08sb9xa7dvvgha3k2xm1srl339przxpxd2y5bh1lnx6k1x7dk410";
+    };
+
+    meta = with lib; {
+      description = "KDE Partition Manager";
+      license = licenses.gpl2;
+      maintainers = with maintainers; [ peterhoeg ];
+    };
+    nativeBuildInputs = [ ecm kdoctools ];
+    # refer to kpmcore for the use of eject
+    buildInputs = [ eject libatasmart ];
+    propagatedBuildInputs = [ kconfig kinit kpmcore ];
+    enableParallelBuilding = true;
+  };
+
+in kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/partitionmanager" ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9492ea44560..95bfb459a0c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2577,6 +2577,8 @@ with pkgs;
 
   knockknock = callPackage ../tools/security/knockknock { };
 
+  partition-manager = libsForQt5.callPackage ../tools/misc/partition-manager { };
+
   kpcli = callPackage ../tools/security/kpcli { };
 
   krename = libsForQt5.callPackage ../applications/misc/krename { };
@@ -9696,6 +9698,8 @@ with pkgs;
       libva = libva-full; # also wants libva-x11
     };
 
+    kpmcore = callPackage ../development/libraries/kpmcore { };
+
     mlt = callPackage ../development/libraries/mlt/qt-5.nix {
       ffmpeg = ffmpeg_2;
     };

From 18bad38d3d928b7dd9ee09a38249dbeb217d34d1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 11 May 2017 14:15:42 +0200
Subject: [PATCH 65/84] pythonPackages.callPackage to make it easier to call
 expressions that take many python packages

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5dff6de52c3..110ce6b8411 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -73,7 +73,7 @@ let
 in {
 
   inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k mkPythonDerivation buildPythonPackage buildPythonApplication;
-  inherit fetchPypi;
+  inherit fetchPypi callPackage;
   inherit sharedLibraryExtension;
 
   # helpers

From e281e59711203ded4d7ed7712b82350e4d68926b Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 11 May 2017 14:34:46 +0200
Subject: [PATCH 66/84] eclipse-plugin-autodetect-encoding: init at 1.8.3

---
 pkgs/applications/editors/eclipse/plugins.nix | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index fddd9e4920b..f48378b1122 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -127,6 +127,29 @@ rec {
     };
   };
 
+  autodetect-encoding = buildEclipsePlugin rec {
+    name = "autodetect-encoding-${version}";
+    version = "1.8.3.201610171338";
+
+    srcFeature = fetchurl {
+      url = "https://cypher256.github.io/eclipse-encoding-plugin/features/eclipse.encoding.plugin.feature_${version}.jar";
+      sha256 = "09xfn5j6vr9r7n0riqs5ja5ms98ax9pyi3f7irnv80flhzagdv7f";
+    };
+
+    srcPlugin = fetchurl {
+      url = "https://cypher256.github.io/eclipse-encoding-plugin/plugins/mergedoc.encoding_${version}.jar";
+      sha256 = "0l2zw4whx1a7j0jl7i6n6igr2ki6jh6nwggx53n3ipzg7cgdcg0y";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = https://github.com/cypher256/eclipse-encoding-plugin;
+      description = "Show file encoding and line ending for the active editor in the eclipse status bar";
+      license = licenses.epl10;
+      platforms = platforms.all;
+      maintainers = [ maintainers.rycee ];
+    };
+  };
+
   bytecode-outline = buildEclipsePlugin rec {
     name = "bytecode-outline-${version}";
     version = "2.4.3";

From 93f47559b291d932335a4c36a2bf469b0e252101 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 11 May 2017 14:40:37 +0200
Subject: [PATCH 67/84] cutegram: add missing qtwebkit dependency

---
 .../instant-messengers/telegram/cutegram/default.nix       | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
index d05ff845ebb..a20119e0d73 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit
 , qtbase, qtmultimedia, qtquick1, qtquickcontrols
-, qtimageformats, qtgraphicaleffects
+, qtimageformats, qtgraphicaleffects, qtwebkit
 , telegram-qml, libqtelegram-aseman-edition
 , gst_all_1
 , makeQtWrapper, qmakeHook }:
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
 
   buildInputs =
   [ qtbase qtmultimedia qtquick1 qtquickcontrols
-    qtimageformats qtgraphicaleffects
-    telegram-qml libqtelegram-aseman-edition 
+    qtimageformats qtgraphicaleffects qtwebkit
+    telegram-qml libqtelegram-aseman-edition
   ] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly ]);
 
   nativeBuildInputs = [ makeQtWrapper qmakeHook ];
@@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
     maintainers = with maintainers; [ profpatsch AndersonTorres ];
     platforms = platforms.linux;
-    broken = true;
   };
 }
 #TODO: appindicator, for system tray plugin (by @profpatsch)

From 641c4116a9cb1fe71e2797a747d35342c0f938e2 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 11 May 2017 21:09:53 +0800
Subject: [PATCH 68/84] kdiff3: 2016-04-20 -> 2017-02-19

---
 pkgs/tools/text/kdiff3/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix
index bd76b89ccf7..124855525ac 100644
--- a/pkgs/tools/text/kdiff3/default.nix
+++ b/pkgs/tools/text/kdiff3/default.nix
@@ -4,16 +4,15 @@
 }:
 
 let
-  rev = "468652ce70b1214842cef0a021c81d056ec6aa01";
-
   unwrapped = kdeDerivation rec {
     name = "kdiff3-${version}";
-    version = "1.7.0-${lib.strings.substring 0 7 rev}";
+    version = "1.7.0-2017-02-19";
 
     src = fetchgit {
-      url = "https://gitlab.com/tfischer/kdiff3";
-      sha256 = "126xl7jbb26v2970ba1rw1d6clhd14p1f2avcwvj8wzqmniq5y5m";
-      inherit rev;
+      # gitlab is outdated
+      url = https://anongit.kde.org/scratch/thomasfischer/kdiff3.git;
+      sha256 = "0znlk9m844a6qsskbd898w4yk48dkg5bkqlkd5abvyrk1jipzyy8";
+      rev = "0d2ac328164e3cbe2db35875d3df3a86187ae84f";
     };
 
     setSourceRoot = ''sourceRoot="$(echo */kdiff3/)"'';

From 4f58a496c36bf4aebd1c5d196175471e67619690 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Thu, 11 May 2017 15:14:55 +0200
Subject: [PATCH 69/84] vndr: 20161110 -> 20170511

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/development/tools/vndr/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/development/tools/vndr/default.nix
index 14f01863c8a..426d52eba70 100644
--- a/pkgs/development/tools/vndr/default.nix
+++ b/pkgs/development/tools/vndr/default.nix
@@ -2,16 +2,17 @@
 
 buildGoPackage rec {
   name = "vndr-${version}";
-  version = "20161110-${lib.strings.substring 0 7 rev}";
-  rev = "cf8678fba5591fbacc4dafab1a22d64f6c603c20";
+  version = "20170511-${lib.strings.substring 0 7 rev}";
+  rev = "0cb33a0eb64c8ca73b8e2939a3430b22fbb8d3e3";
 
   goPackagePath = "github.com/LK4D4/vndr";
+  excludedPackages = "test";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "LK4D4";
     repo = "vndr";
-    sha256 = "1fbrpdpfir05hqj1dr8rxw8hnjkhl0xbzncxkva56508vyyzbxcs";
+    sha256 = "02vdr59xn79hffayfcxg29nf62rdc33a60i104fgj746kcswgy5n";
   };
 
   meta = {

From fd7a8f1b91a002cd0de93b59064f83e29e3e8034 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Mon, 8 May 2017 18:14:37 +0200
Subject: [PATCH 70/84] nixos/security/acme: fix acme folder permissions

---
 nixos/modules/security/acme.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 5301ac14805..321b9f7f375 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -185,12 +185,15 @@ in
                   path = [ pkgs.simp_le ];
                   preStart = ''
                     mkdir -p '${cfg.directory}'
-                    chown -R '${data.user}:${data.group}' '${cfg.directory}'
+                    chown 'root:root' '${cfg.directory}'
+                    chmod 755 '${cfg.directory}'
                     if [ ! -d '${cpath}' ]; then
                       mkdir '${cpath}'
                     fi
                     chmod ${rights} '${cpath}'
                     chown -R '${data.user}:${data.group}' '${cpath}'
+                    mkdir -p '${data.webroot}/.well-known/acme-challenge'
+                    chown -R '${data.user}:${data.group}' '${data.webroot}/.well-known/acme-challenge'
                   '';
                   script = ''
                     cd '${cpath}'

From c58aa3a508538d367a169d4ae09458ce2ac98440 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 11 May 2017 19:47:53 +0200
Subject: [PATCH 71/84] python-dogpile-cache: disable concurrency tests

---
 pkgs/development/python-modules/dogpile.cache/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix
index af8bd1a1d11..de6efe40af7 100644
--- a/pkgs/development/python-modules/dogpile.cache/default.nix
+++ b/pkgs/development/python-modules/dogpile.cache/default.nix
@@ -12,6 +12,12 @@ buildPythonPackage rec {
     sha256 = "73793471af07af6dc5b3ee015abfaca4220caaa34c615537f5ab007ed150726d";
   };
 
+  # Disable concurrency tests that often fail,
+  # probably some kind of timing issue.
+  prePatch = ''
+    rm tests/test_lock.py
+  '';
+
   propagatedBuildInputs = [ dogpile_core ];
   buildInputs = [ pytest pytestcov mock Mako ];
 

From 4f676a08259e1bf8c6c2f5f56875caff2e74b79f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 11 May 2017 13:36:17 +0100
Subject: [PATCH 72/84] megatools: use wrapGAppsHook

---
 pkgs/tools/networking/megatools/default.nix | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix
index f948ab8eb61..7c7c63ef230 100644
--- a/pkgs/tools/networking/megatools/default.nix
+++ b/pkgs/tools/networking/megatools/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, glib, fuse, curl, glib_networking, gsettings_desktop_schemas
-, asciidoc, makeWrapper }:
+{ stdenv, fetchurl, pkgconfig, glib, fuse, curl, glib_networking
+, asciidoc, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "megatools-${version}";
@@ -10,16 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "0vx1farp0dpg4zwvxdbfdnzjk9qx3sn109p1r1zl3g3xsaj221cv";
   };
 
-  buildInputs = [ pkgconfig glib fuse curl makeWrapper
-      gsettings_desktop_schemas asciidoc ];
-
-  postInstall = ''
-    for i in $(find $out/bin/ -type f); do
-      wrapProgram "$i" \
-            --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
-            --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook asciidoc ];
+  buildInputs = [ glib glib_networking fuse curl ];
 
   meta = with stdenv.lib; {
     description = "Command line client for Mega.co.nz";

From 728b8ab4835a889f7da947901f391d2256d13081 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 11 May 2017 13:36:33 +0100
Subject: [PATCH 73/84] pcsxr: use wrapGAppsHook

---
 pkgs/misc/emulators/pcsxr/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/misc/emulators/pcsxr/default.nix
index bb6997dfb96..c402dd44428 100644
--- a/pkgs/misc/emulators/pcsxr/default.nix
+++ b/pkgs/misc/emulators/pcsxr/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, autoreconfHook, intltool, pkgconfig, gtk3, SDL2, xorg
-, gsettings_desktop_schemas, makeWrapper, libcdio, nasm, ffmpeg, file
+, wrapGAppsHook, libcdio, nasm, ffmpeg, file
 , fetchpatch }:
 
 stdenv.mkDerivation rec {
@@ -49,9 +49,9 @@ stdenv.mkDerivation rec {
     ./uncompress2.patch
   ];
 
+  nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ];
   buildInputs = [
-    autoreconfHook intltool pkgconfig gtk3 SDL2 xorg.libXv xorg.libXtst
-    makeWrapper libcdio nasm ffmpeg file
+    gtk3 SDL2 xorg.libXv xorg.libXtst libcdio nasm ffmpeg file
   ];
 
   dynarecTarget =
@@ -67,8 +67,6 @@ stdenv.mkDerivation rec {
   ];
 
   postInstall = ''
-    wrapProgram "$out/bin/pcsxr" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
     mkdir -p "$out/share/doc/${name}"
     cp README \
        AUTHORS \

From 3dc109cbc22b7ff030ecdee67bc3d172176b3d30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 11 May 2017 13:37:00 +0100
Subject: [PATCH 74/84] blueman: use wrapGAppsHook

---
 pkgs/tools/bluetooth/blueman/default.nix | 9 ++++-----
 pkgs/top-level/all-packages.nix          | 1 -
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 6dce2a38798..0c298aa1f21 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3
-, obex_data_server, xdg_utils, libnotify, dconf, gsettings_desktop_schemas, dnsmasq, dhcp
+, obex_data_server, xdg_utils, libnotify, dnsmasq, dhcp
 , hicolor_icon_theme, librsvg, wrapGAppsHook
 , withPulseAudio ? true, libpulseaudio }:
 
@@ -9,7 +9,7 @@ let
 in stdenv.mkDerivation rec {
   name = "blueman-${version}";
   version = "2.0.4";
-   
+
   src = fetchurl {
     url = "https://github.com/blueman-project/blueman/releases/download/${version}/${name}.tar.xz";
     sha256 = "03s305mbc57nl3sq5ywh9casz926k4aqnylgaidli8bmgz1djbg9";
@@ -17,8 +17,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ intltool pkgconfig pythonPackages.wrapPython pythonPackages.cython wrapGAppsHook ];
 
-  buildInputs = [ bluez gtk3 pythonPackages.python libnotify dconf librsvg
-                  gsettings_desktop_schemas hicolor_icon_theme ]
+  buildInputs = [ bluez gtk3 pythonPackages.python libnotify librsvg hicolor_icon_theme ]
                 ++ pythonPath
                 ++ lib.optional withPulseAudio libpulseaudio;
 
@@ -28,7 +27,7 @@ in stdenv.mkDerivation rec {
 
   pythonPath = with pythonPackages; [ dbus-python pygobject3 pycairo ];
 
-  propagatedUserEnvPkgs = [ obex_data_server dconf ];
+  propagatedUserEnvPkgs = [ obex_data_server ];
 
   configureFlags = [ (lib.enableFeature withPulseAudio "pulseaudio") ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ce797efcc56..40978badba0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1138,7 +1138,6 @@ with pkgs;
   };
 
   blueman = callPackage ../tools/bluetooth/blueman {
-    inherit (gnome3) dconf gsettings_desktop_schemas;
     withPulseAudio = config.pulseaudio or true;
   };
 

From aa858b9f2e9c626d3ee91440d64326977776a6c1 Mon Sep 17 00:00:00 2001
From: Utku Demir <utdemir@gmail.com>
Date: Fri, 12 May 2017 09:29:52 +1200
Subject: [PATCH 75/84] Set clac.meta.platforms to "unix" instead of "linux"

---
 pkgs/tools/misc/clac/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/clac/default.nix b/pkgs/tools/misc/clac/default.nix
index 9fd8711a3d0..48f3b613564 100644
--- a/pkgs/tools/misc/clac/default.nix
+++ b/pkgs/tools/misc/clac/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     description = "Interactive stack-based calculator";
     license = stdenv.lib.licenses.bsd2;
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     homepage = "https://github.com/soveran/clac";
   };
 }

From 995d41c09197803624a419114b5c5cd2c90e46bc Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Thu, 11 May 2017 10:06:26 +0100
Subject: [PATCH 76/84] nvidia stable: 375.39 -> 375.66

---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 10 +++++-----
 pkgs/os-specific/linux/nvidia-x11/generic.nix |  6 ++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index f5e849e95e1..633b241cd71 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -6,11 +6,11 @@ in
 {
   # Policy: use the highest stable version as the default (on our master).
   stable = generic {
-    version = "375.39";
-    sha256_32bit = "0mlly5n84640xa2mcdqqg44s42ck6g3lj5skf7gmfp2w5ibzccvz";
-    sha256_64bit = "19w5v81f770rqjrvdwz11k015zli2y8f4x10ydqxcy0nhhh5mgli";
-    settingsSha256 = "0f881q4jzliqzqi1p5lzwz86h829m5g74zdj7nlfi1cc6s45g5p5";
-    persistencedSha256 = "0zj6wdcgg2ljhvsssfsqz9wk28ykmsh4gwmis31q3rsrkq668x33";
+    version = "375.66";
+    sha256_32bit = "0k7ib5ah3c2apzgzxlq75l48zm8901mbwj7slv18k3rhk8j0w8i9";
+    sha256_64bit = "1h01s8brpz42jwc24dsflm4psd3zsy26ds98h0adgwx51dbpzqsr";
+    settingsSha256 = "0bpdayyqw4cpgl7bgddfz6w5j8y3wsgr89p5vxnzgk9g0vgqxh5h";
+    persistencedSha256 = "113rllf9l26z546jjfijpxllp17qcpawblzxvsqc6rbzbkmvcdwi";
   };
 
   beta = generic {
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index cb88a55a134..4d1af13a0a8 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -57,9 +57,11 @@ let
                          # with datestamps removed
                      ./fs52243.patch
                    ]
-              else [ (fetchurl {
+              else if versionOlder version "375.66"
+              then [ (fetchurl {
                       url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel_4.10.patch?h=packages/nvidia;  sha256 = "0zhpx3baq2pca2pmz1af5cp2nzjxjx0j9w5xrdy204mnv3v2708z";
-                     }) ];
+                     }) ]
+              else null;
 
     inherit version useGLVND useProfiles;
     inherit (stdenv) system;

From 89ce83688cda03df01307bc74bfa3950a4d5266e Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Thu, 11 May 2017 14:16:34 +0100
Subject: [PATCH 77/84] nvidia-x11: fix linux 4.10 patch URL

---
 pkgs/os-specific/linux/nvidia-x11/generic.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index 4d1af13a0a8..f22cdb1ad0a 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -59,7 +59,8 @@ let
                    ]
               else if versionOlder version "375.66"
               then [ (fetchurl {
-                      url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel_4.10.patch?h=packages/nvidia;  sha256 = "0zhpx3baq2pca2pmz1af5cp2nzjxjx0j9w5xrdy204mnv3v2708z";
+                      url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel_4.10.patch?h=packages/nvidia&id=0aac90023677e08838c75a1d7429d5c64e2093ae;
+                      sha256 = "0zhpx3baq2pca2pmz1af5cp2nzjxjx0j9w5xrdy204mnv3v2708z";
                      }) ]
               else null;
 

From 11b8cfb506a75fd3cd93ee9ae21d89e4581ffb4d Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Thu, 11 May 2017 17:52:13 -0700
Subject: [PATCH 78/84] nvidia_x11_beta: 378.13 -> 381.22

also remove nvidia 4.10 kernel patch as it is no longer needed
---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 10 +++++-----
 pkgs/os-specific/linux/nvidia-x11/generic.nix |  5 -----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 633b241cd71..c117f8f29fa 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -14,11 +14,11 @@ in
   };
 
   beta = generic {
-    version = "378.13";
-    sha256_32bit = "1ca6kbk20kki5f698x1ga9b1v1is4mr10f7f70s3gixak1h2mrh5";
-    sha256_64bit = "1vj2vyy6vim0qis7iqq4la6k6bnby65p3qjbl888qnpjkqj7kqrx";
-    settingsSha256 = "08q04cd769l1i6737ylvanaxrqg8fym05kjp7kvpz28764g96gxj";
-    persistencedSha256 = "0hmxp5fbxwl9f7c9fspg65my6lwynpqhz02zw7100dgwqb2vn1qj";
+    version = "381.22";
+    sha256_32bit = "024x3c6hrivg2bkbzv1xd0585hvpa2kbn1y2gwvca7c73kpdczbv";
+    sha256_64bit = "13fj9ndy5rmh410d0vi2b0crfl7rbsm6rn7cwms0frdzkyhshghs";
+    settingsSha256 = "1gls187zfd201b29qfvwvqvl5gvp5wl9lq966vd28crwqh174jrh";
+    persistencedSha256 = "08315rb9l932fgvy758an5vh3jgks0qc4g36xip4l32pkxd9k963";
   };
 
   legacy_340 = generic {
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index f22cdb1ad0a..8e3f589c377 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -57,11 +57,6 @@ let
                          # with datestamps removed
                      ./fs52243.patch
                    ]
-              else if versionOlder version "375.66"
-              then [ (fetchurl {
-                      url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel_4.10.patch?h=packages/nvidia&id=0aac90023677e08838c75a1d7429d5c64e2093ae;
-                      sha256 = "0zhpx3baq2pca2pmz1af5cp2nzjxjx0j9w5xrdy204mnv3v2708z";
-                     }) ]
               else null;
 
     inherit version useGLVND useProfiles;

From 49d3b432c35e19ef93c982420989cd12c1c382fb Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 12 May 2017 11:12:52 +0800
Subject: [PATCH 79/84] docker: fix reference to unknown attribute

---
 pkgs/top-level/all-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40978badba0..696b65ef690 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13422,7 +13422,6 @@ with pkgs;
 
   inherit (callPackage ../applications/virtualization/docker { })
     docker_17_03
-    docker_17_04
     docker_17_05;
 
   docker = docker_17_03;

From 450a76eb62e92058cc742f0f607a1a05a3c859f1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 May 2017 20:00:39 +0200
Subject: [PATCH 80/84] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.2.1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/979529ca1b8e346c5f0a3c75df24ba469ca3beb2.
---
 .../haskell-modules/hackage-packages.nix      | 2640 ++++++++++++++---
 1 file changed, 2212 insertions(+), 428 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 16b21d8011b..f7969b977a4 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1377,8 +1377,8 @@ self: {
      }:
      mkDerivation {
        pname = "BioHMM";
-       version = "1.1.1";
-       sha256 = "45120cf01965a8c3e4b8fdc1bc338ad085971fe4cd2b5f18af11d42a3c780b4f";
+       version = "1.1.3";
+       sha256 = "8a225ad7e6e8239b3363c808adfd95f7296b49f35edfc9150d4779db08a59240";
        libraryHaskellDepends = [
          base colour diagrams-cairo diagrams-lib directory either-unwrap
          filepath parsec ParsecTools StockholmAlignment SVGFonts text vector
@@ -1683,8 +1683,8 @@ self: {
      }:
      mkDerivation {
        pname = "BitStringRandomMonad";
-       version = "0.2.0.2";
-       sha256 = "9142bd6d2494e6585037efe2c4e9040dcb7b781cfa1881d116b2534abf1333fc";
+       version = "1.0.0.1";
+       sha256 = "fd6471a3de45b16114c9612dc378fe5ad92bbf61d3ee879f40ec014aad47d3ea";
        libraryHaskellDepends = [
          base bitstring bytestring mtl parallel primitive transformers
          vector
@@ -3911,18 +3911,22 @@ self: {
      }) {};
 
   "Delta-Lambda" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, cpphs, filepath
+    ({ mkDerivation, base, bytestring, Cabal, cereal, cpphs, filepath
      , haskeline, megaparsec, mtl, options, parallel, text, wl-pprint
      }:
      mkDerivation {
        pname = "Delta-Lambda";
-       version = "0.2.0.0";
-       sha256 = "257636843d457a08119e1e410b46fa5ea51e25f1b84cfed0b27355fb96afb232";
+       version = "0.3.0.0";
+       sha256 = "18f7a1c899fd7a4f1b5055d02050a98f024f7afcdb6092b550b30514942265fc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base bytestring cereal cpphs filepath haskeline megaparsec mtl
-         options parallel text wl-pprint
+         base bytestring Cabal cereal cpphs filepath haskeline megaparsec
+         mtl options parallel text wl-pprint
+       ];
+       testHaskellDepends = [
+         base bytestring Cabal cereal cpphs filepath haskeline megaparsec
+         mtl options parallel text wl-pprint
        ];
        homepage = "https://github.com/listofoptions/delta-lambda";
        description = "A demonstration interpreter for type system delta-lambda (of N.G. De-bruijn)";
@@ -6618,18 +6622,15 @@ self: {
 
   "Graphalyze" = callPackage
     ({ mkDerivation, array, base, bktrees, containers, directory, fgl
-     , filepath, graphviz, old-locale, pandoc, process, random, text
-     , time
+     , filepath, graphviz, pandoc, process, random, text, time
      }:
      mkDerivation {
        pname = "Graphalyze";
-       version = "0.14.1.1";
-       sha256 = "9792207d74f5aff52b3e5b83378db480702b8b5e1b13e65113e2f32e7687ce9f";
-       revision = "1";
-       editedCabalFile = "25847f733dbed8809d4bec1b14c839a41668b997dd9d1b70572f123cb5010e3d";
+       version = "0.15.0.0";
+       sha256 = "ac40fcb75d530932e14ff1dab09ab2d85c9679f27d75b88be3d4c76b5d1986c3";
        libraryHaskellDepends = [
          array base bktrees containers directory fgl filepath graphviz
-         old-locale pandoc process random text time
+         pandoc process random text time
        ];
        description = "Graph-Theoretic Analysis library";
        license = "unknown";
@@ -7129,6 +7130,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) mpfr;};
 
+  "HFitUI" = callPackage
+    ({ mkDerivation, base, blaze-html, blaze-markup, MissingH, mtl
+     , process, random, shakespeare, template-haskell, text, uuid
+     }:
+     mkDerivation {
+       pname = "HFitUI";
+       version = "0.1.0.0";
+       sha256 = "9def238955e90842ffc334e1dfa6bfa8fc20cf64b75b5e3be89333c5ccd3713c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup MissingH mtl process random
+         shakespeare template-haskell text uuid
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/iqsf/HFitUI.git";
+       description = "The library for generating a graphical interface on the web";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "HFrequencyQueue" = callPackage
     ({ mkDerivation, base, c-storable-deriving }:
      mkDerivation {
@@ -8214,6 +8236,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HSet_0_0_1" = callPackage
+    ({ mkDerivation, base, containers, hashable, hashtables }:
+     mkDerivation {
+       pname = "HSet";
+       version = "0.0.1";
+       sha256 = "eba93be5a76581585ae33af6babe9c2718fae307d41989cd36a605d9b0e8d16a";
+       libraryHaskellDepends = [ base containers hashable hashtables ];
+       description = "Faux heterogeneous sets";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HSlippyMap" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -8658,15 +8692,14 @@ self: {
 
   "HaTeX-qq" = callPackage
     ({ mkDerivation, antiquoter, base, haskell-src-meta, HaTeX
-     , template-haskell, text, uniplate
+     , template-haskell, text
      }:
      mkDerivation {
        pname = "HaTeX-qq";
-       version = "0.0.1.2";
-       sha256 = "60db927820811c1bbc17890e21188caeb9441f40c6a5fb5c5436101eca4a0c61";
+       version = "0.1.0.1";
+       sha256 = "a82d8e00acc08cbec76e2a5971404a0ac1a8063e8e8f183975ae2624c4964fa4";
        libraryHaskellDepends = [
          antiquoter base haskell-src-meta HaTeX template-haskell text
-         uniplate
        ];
        description = "Quasiquoters for HaTeX";
        license = stdenv.lib.licenses.bsd3;
@@ -13898,8 +13931,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "Piso";
-       version = "0.1";
-       sha256 = "03455602293e88a9860129f0c2825db907257923dabf5fa9684de955b6e27088";
+       version = "0.2";
+       sha256 = "36dd199c6799d7f171928d5d57b3dbd621dadb019fc1fc7cf5d62cf2e1e43f1f";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/MedeaMelana/Piso";
        description = "Partial isomorphisms";
@@ -16580,8 +16613,8 @@ self: {
      }:
      mkDerivation {
        pname = "StockholmAlignment";
-       version = "1.0.4";
-       sha256 = "2f6e57131e979dd568338892af23217a3a723cc72aae466efba0d421beb2092b";
+       version = "1.1.0";
+       sha256 = "6cfae60f6acbcbab470480bf6b3ee0af7c2442e4c8d010d9972f91bc99a29b79";
        libraryHaskellDepends = [
          base colour diagrams-cairo diagrams-lib directory either-unwrap
          filepath parsec ParsecTools SVGFonts text vector
@@ -18841,6 +18874,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Yampa_0_10_6" = callPackage
+    ({ mkDerivation, base, deepseq, random }:
+     mkDerivation {
+       pname = "Yampa";
+       version = "0.10.6";
+       sha256 = "565334aa1cfd775f51a53b98f2bfdffd84e2edb6d590966e72d36a34367d0a18";
+       libraryHaskellDepends = [ base deepseq random ];
+       testHaskellDepends = [ base ];
+       homepage = "http://www.haskell.org/haskellwiki/Yampa";
+       description = "Library for programming hybrid systems";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Yampa-core" = callPackage
     ({ mkDerivation, base, deepseq, random, vector-space }:
      mkDerivation {
@@ -21039,6 +21086,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aeson-injector_1_0_8_0" = callPackage
+    ({ mkDerivation, aeson, base, bifunctors, deepseq, HUnit, lens
+     , QuickCheck, quickcheck-text, scientific, servant-docs, swagger2
+     , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "aeson-injector";
+       version = "1.0.8.0";
+       sha256 = "51f9e703b9f3dcdacc8477e6c4d7f0fdb7d3ebacd27907e52503d95bb582accc";
+       libraryHaskellDepends = [
+         aeson base bifunctors deepseq lens servant-docs swagger2 text
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base HUnit lens QuickCheck quickcheck-text scientific
+         swagger2 tasty tasty-hunit tasty-quickcheck text vector
+       ];
+       description = "Injecting fields into aeson values";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-iproute" = callPackage
     ({ mkDerivation, aeson, base, iproute, text }:
      mkDerivation {
@@ -25212,8 +25282,8 @@ self: {
      }:
      mkDerivation {
        pname = "api-field-json-th";
-       version = "0.1.0.1";
-       sha256 = "88befb216037f0460950cd91960db2ba7789231b6ab829b04b2b9dd60a007626";
+       version = "0.1.0.2";
+       sha256 = "b8d49c3869bc8104539c43d5544ed2271d1e68a963440d781ee71d2252b0f724";
        libraryHaskellDepends = [
          aeson base lens split template-haskell text
        ];
@@ -26632,22 +26702,22 @@ self: {
 
   "arx" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
-     , bytestring-nums, containers, file-embed, parsec, process
-     , shell-escape, template-haskell
+     , bytestring-nums, containers, file-embed, hashable, parsec
+     , process, shell-escape, template-haskell
      }:
      mkDerivation {
        pname = "arx";
-       version = "0.2.2";
-       sha256 = "a294fdbeb0e5da2762e855620c75289fbac09872efa76c14e1a47dd2d2ef8011";
+       version = "0.2.3";
+       sha256 = "0a829da8c71fc55da968483764a97838fdf5fe043f6d9302ab606aa7cd609db6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring bytestring-nums containers
-         file-embed parsec process shell-escape template-haskell
+         file-embed hashable parsec process shell-escape template-haskell
        ];
        executableHaskellDepends = [
          attoparsec base blaze-builder bytestring bytestring-nums containers
-         file-embed parsec process shell-escape template-haskell
+         file-embed hashable parsec process shell-escape template-haskell
        ];
        homepage = "http://github.com/solidsnack/arx/";
        description = "Archive execution tool";
@@ -28748,8 +28818,8 @@ self: {
      }:
      mkDerivation {
        pname = "aws-ec2";
-       version = "0.3.5";
-       sha256 = "17df4a182a25d1de78cddf933e9a9ae342d989e55487cbbc6b307ced4e2aef3b";
+       version = "0.3.6";
+       sha256 = "a4ba2b8fd6d00b69813330fd0ea3caccbca53c350f0f1a4601ab827ad99d6592";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -29485,6 +29555,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ballast" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, either-unwrap, hspec
+     , hspec-expectations, http-client, http-client-tls, http-types
+     , text, time, transformers, unordered-containers, utf8-string
+     , vector
+     }:
+     mkDerivation {
+       pname = "ballast";
+       version = "0.1.0.0";
+       sha256 = "0e9fd358b4f39fb0f0379fd22b934b6e11a5fde515d306d87d3248428b747fea";
+       libraryHaskellDepends = [
+         aeson base bytestring either-unwrap hspec hspec-expectations
+         http-client http-client-tls http-types text time transformers
+         unordered-containers utf8-string vector
+       ];
+       testHaskellDepends = [
+         base bytestring either-unwrap hspec hspec-expectations text time
+       ];
+       homepage = "https://github.com/bitemyapp/ballast#readme";
+       description = "Shipwire API client";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bamboo" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default
      , directory, filepath, gravatar, hack, hack-contrib, haskell98, mps
@@ -33923,14 +34016,14 @@ self: {
 
   "ble" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, d-bus
-     , data-default-class, hslogger, hspec, microlens, microlens-ghc
-     , microlens-th, mtl, QuickCheck, quickcheck-instances, random, stm
-     , text, transformers, uuid
+     , data-default-class, hslogger, hspec, markdown-unlit, microlens
+     , microlens-ghc, microlens-th, mtl, QuickCheck
+     , quickcheck-instances, random, stm, text, transformers, uuid
      }:
      mkDerivation {
        pname = "ble";
-       version = "0.3.3.0";
-       sha256 = "763849dc7e8f3189cb293f6ed53f966140bf4265128e9a8eeb6b0f681181d676";
+       version = "0.3.4.0";
+       sha256 = "aff4728db140e90a29139939b862c69d279e1034c732d152bcadce846a148c98";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -33940,8 +34033,8 @@ self: {
        ];
        executableHaskellDepends = [
          base bytestring cereal containers d-bus data-default-class hslogger
-         microlens microlens-ghc microlens-th mtl random stm text
-         transformers uuid
+         markdown-unlit microlens microlens-ghc microlens-th mtl random stm
+         text transformers uuid
        ];
        testHaskellDepends = [
          base bytestring cereal containers d-bus data-default-class hslogger
@@ -34263,6 +34356,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "bluemix-sdk" = callPackage
+    ({ mkDerivation, aeson, base, http-client, http-types, text, vector
+     }:
+     mkDerivation {
+       pname = "bluemix-sdk";
+       version = "0.1.0.0";
+       sha256 = "b2e941e5e7a64b95edda1851fb5c082b81ed4e2897e8c8a2d07b926f7835fd48";
+       libraryHaskellDepends = [
+         aeson base http-client http-types text vector
+       ];
+       homepage = "https://github.com/agrafix/bluemix-sdk#readme";
+       description = "Bindings to Bluemix APIs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bluetile" = callPackage
     ({ mkDerivation, base, ConfigFile, containers, directory, filepath
      , glade, gtk, gtk2, mtl, process, random, regex-compat, unix
@@ -36837,6 +36945,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cabal-doctest_1_0_1" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath }:
+     mkDerivation {
+       pname = "cabal-doctest";
+       version = "1.0.1";
+       sha256 = "549af049e10373ffdcea29688216881b63e69fa3a982cdb0d0f14c18b3aa48ba";
+       libraryHaskellDepends = [ base Cabal directory filepath ];
+       homepage = "https://github.com/phadej/cabal-doctest";
+       description = "A Setup.hs helper for doctests running";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cabal-file-th" = callPackage
     ({ mkDerivation, base, Cabal, directory, pretty, template-haskell
      }:
@@ -37484,8 +37605,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal2nix";
-       version = "2.2";
-       sha256 = "edf25f92fe94d14fef194363ec5c2e1ca653bd775821a470d6286046350a037e";
+       version = "2.2.1";
+       sha256 = "a7bb4ac56256944edb5232ff32d83627fd96c3d2bdb3c0475582bd30dbe883c3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41128,6 +41249,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "cj-token" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, containers, either
+     , hspec, jwt, QuickCheck, text, text-conversions, time
+     }:
+     mkDerivation {
+       pname = "cj-token";
+       version = "0.0.1";
+       sha256 = "75b768ec0bb6d167f9a0fd6314025e29784d465f615225ba5c29582788c0c568";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base64-bytestring containers either jwt text
+         text-conversions time
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base hspec jwt QuickCheck text text-conversions time
+       ];
+       description = "A new Haskeleton package";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "cjk" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, text
      , text-icu
@@ -44235,8 +44378,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-aeson";
-       version = "0.3.1.0";
-       sha256 = "0a61caaa31d80e2b4439ffd3174fee6a3446a6257051d91806b6189ce14b66d6";
+       version = "0.4.1.0";
+       sha256 = "631b6fbdfff6026748a5b35b3f5ed8af92c3e70744ebd4d2c8b72c1738077d69";
        libraryHaskellDepends = [
          aeson aeson-better-errors base composite-base containers
          contravariant generic-deriving hashable lens profunctors scientific
@@ -44253,21 +44396,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "composite-aeson-refined" = callPackage
+    ({ mkDerivation, base, composite-aeson, refined }:
+     mkDerivation {
+       pname = "composite-aeson-refined";
+       version = "0.4.1.0";
+       sha256 = "9310f3a61d962688cf96f1bb659c8775cc7f22c785c4baecc174aace1e9499b4";
+       libraryHaskellDepends = [ base composite-aeson refined ];
+       homepage = "https://github.com/ConferHealth/composite#readme";
+       description = "composite-aeson support for Refined from the refined package";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "composite-base" = callPackage
     ({ mkDerivation, base, exceptions, hspec, lens, monad-control, mtl
-     , QuickCheck, template-haskell, text, transformers
+     , profunctors, QuickCheck, template-haskell, text, transformers
      , transformers-base, vinyl
      }:
      mkDerivation {
        pname = "composite-base";
-       version = "0.3.1.0";
-       sha256 = "c2c275548f0f566bb4eade400c026fab551fd65ff35f965858c37dc72726c0b6";
+       version = "0.4.1.0";
+       sha256 = "89fbb843f616d9247132e79960988e1b3c870299c2ecc36d1b4fd5726260dd9b";
        libraryHaskellDepends = [
-         base exceptions lens monad-control mtl template-haskell text
-         transformers transformers-base vinyl
+         base exceptions lens monad-control mtl profunctors template-haskell
+         text transformers transformers-base vinyl
        ];
        testHaskellDepends = [
-         base exceptions hspec lens monad-control mtl QuickCheck
+         base exceptions hspec lens monad-control mtl profunctors QuickCheck
          template-haskell text transformers transformers-base vinyl
        ];
        homepage = "https://github.com/ConferHealth/composite#readme";
@@ -44281,8 +44436,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-ekg";
-       version = "0.3.1.0";
-       sha256 = "155d034a59166e1defe5d564a03f864eb9b99cc6c1853460c7ce954940c5e65e";
+       version = "0.4.1.0";
+       sha256 = "38b6d15dae3c23ec2766dfbfda3bab28927a3e32749cca1324f0ee6588bf71f5";
        libraryHaskellDepends = [
          base composite-base ekg ekg-core lens text vinyl
        ];
@@ -44298,8 +44453,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-opaleye";
-       version = "0.3.1.0";
-       sha256 = "388a609b0d55732fe4b17a155916aa94899b172991c45f9a1ebf713ddd8e1be0";
+       version = "0.4.1.0";
+       sha256 = "b3127fcaf7b4a6b7b0f38906957ccff5ca1b658d8e2dfb9b24de872eb37a65c9";
        libraryHaskellDepends = [
          base bytestring composite-base lens opaleye postgresql-simple
          product-profunctors profunctors template-haskell text vinyl
@@ -45408,6 +45563,24 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "config-schema" = callPackage
+    ({ mkDerivation, base, config-value, containers, free
+     , kan-extensions, pretty, semigroupoids, text, transformers
+     }:
+     mkDerivation {
+       pname = "config-schema";
+       version = "0.3.0.0";
+       sha256 = "a8542100682159fed8c8bfdd75c8f7a9c9783a20cb106fc387b803866ac3393c";
+       libraryHaskellDepends = [
+         base config-value containers free kan-extensions pretty
+         semigroupoids text transformers
+       ];
+       testHaskellDepends = [ base config-value text ];
+       homepage = "https://github.com/glguy/config-schema";
+       description = "Schema definitions for the config-value package";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "config-select" = callPackage
     ({ mkDerivation, base, directory, filepath, unix, vty-menu }:
      mkDerivation {
@@ -45428,10 +45601,8 @@ self: {
     ({ mkDerivation, alex, array, base, happy, pretty, text }:
      mkDerivation {
        pname = "config-value";
-       version = "0.5";
-       sha256 = "2a2d825c1f23516c64d5ca6b587951b80be44006c09832177e61cfc0743692fa";
-       revision = "1";
-       editedCabalFile = "03d1de33c56ea5153710ced97a146038c5ec744335db1acb9f3a366fc4a24dc2";
+       version = "0.6";
+       sha256 = "99b10d45d53bcfbe51060d4d7c74ccbf18475e746011471ec35930968a85a141";
        libraryHaskellDepends = [ array base pretty text ];
        libraryToolDepends = [ alex happy ];
        homepage = "https://github.com/glguy/config-value";
@@ -45443,10 +45614,8 @@ self: {
     ({ mkDerivation, base, config-value, text }:
      mkDerivation {
        pname = "config-value-getopt";
-       version = "0.1.0.0";
-       sha256 = "00b65bcf60b26f7004665f183d7114dfb6380230c2f50e093403ca8a74bfaccb";
-       revision = "1";
-       editedCabalFile = "bcabc9ce380b21989fc45664b654c2cf1474bd3dc4caa1a7961f8d1181fbd49b";
+       version = "0.1.1.0";
+       sha256 = "8c2c48abbb47c18f62248d91ebb4c7b50fb343504bdd17a6c60def132847ef7a";
        libraryHaskellDepends = [ base config-value text ];
        homepage = "https://github.com/GaloisInc/config-value-getopt";
        description = "Interface between config-value and System.GetOpt";
@@ -47136,6 +47305,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "courier_0_1_1_5" = callPackage
+    ({ mkDerivation, async, base, bytestring, cereal, containers
+     , directory, hslogger, HUnit, network, stm, test-framework
+     , test-framework-hunit, text, uuid
+     }:
+     mkDerivation {
+       pname = "courier";
+       version = "0.1.1.5";
+       sha256 = "ac9e674ff33de347b173da2892859b3807a408b341d10d6101d2a7d07ac334d3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bytestring cereal containers hslogger network stm text
+         uuid
+       ];
+       executableHaskellDepends = [ base cereal ];
+       testHaskellDepends = [
+         async base cereal containers directory hslogger HUnit network stm
+         test-framework test-framework-hunit
+       ];
+       homepage = "http://github.com/hargettp/courier";
+       description = "A message-passing library for simplifying network applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "court" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, filepath
      , old-locale, optparse-applicative, process, stm, text, time, unix
@@ -48106,6 +48301,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) protobuf;};
 
+  "crjdt-haskell" = callPackage
+    ({ mkDerivation, base, containers, free, hedgehog, hspec, mtl, text
+     }:
+     mkDerivation {
+       pname = "crjdt-haskell";
+       version = "0.2.1";
+       sha256 = "1e1381bd4d7e3dd5fd95fd9d9697538c4a11342a607346f65cd666bb9875b435";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers free mtl text ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base containers hedgehog hspec mtl ];
+       homepage = "https://github.com/amarpotghan/crjdt-haskell#readme";
+       description = "A Conflict-Free Replicated JSON Datatype for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "crockford" = callPackage
     ({ mkDerivation, base, digits, QuickCheck, safe }:
      mkDerivation {
@@ -52973,6 +53185,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "debug-me" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, cereal, containers
+     , cryptonite, directory, filepath, graphviz, http-client
+     , http-client-tls, http-types, memory, mime-mail, network
+     , network-uri, optparse-applicative, posix-pty, process, protobuf
+     , sandi, stm, stm-chans, terminal-size, text, time
+     , unbounded-delays, unix, unordered-containers, utf8-string, uuid
+     , wai, wai-websockets, warp, websockets
+     }:
+     mkDerivation {
+       pname = "debug-me";
+       version = "1.20170509";
+       sha256 = "154db83b9720d78ad3a75136925e98f723c20498a6bc74af4fcad995467e2162";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson async base bytestring cereal containers cryptonite directory
+         filepath graphviz http-client http-client-tls http-types memory
+         mime-mail network network-uri optparse-applicative posix-pty
+         process protobuf sandi stm stm-chans terminal-size text time
+         unbounded-delays unix unordered-containers utf8-string uuid wai
+         wai-websockets warp websockets
+       ];
+       homepage = "https://debug-me.branchable.com/";
+       description = "secure remote debugging";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "debug-time" = callPackage
     ({ mkDerivation, base, clock, containers }:
      mkDerivation {
@@ -54235,6 +54475,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dhall-check" = callPackage
+    ({ mkDerivation, base, containers, dhall, directory, filepath
+     , fsnotify, text, trifecta
+     }:
+     mkDerivation {
+       pname = "dhall-check";
+       version = "1.1.0.0";
+       sha256 = "0a75aca9dff0eba0bf76bd64c7a6b29ecabe2c4b6260dc736da9b6abadef0a49";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base containers dhall directory filepath fsnotify text trifecta
+       ];
+       homepage = "https://github.com/anfelor/dhall-check#readme";
+       description = "Check all dhall files in a project";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dhall-json" = callPackage
     ({ mkDerivation, aeson, base, bytestring, dhall, neat-interpolation
      , optparse-generic, text, trifecta, vector, yaml
@@ -54275,6 +54533,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "di" = callPackage
+    ({ mkDerivation, base, stm, text, time, transformers }:
+     mkDerivation {
+       pname = "di";
+       version = "0.1";
+       sha256 = "883b9a41287b55785b28e207d3ad4af78f3033d2227a895bb497c0b249177e1b";
+       revision = "1";
+       editedCabalFile = "0c076158efd3cf328a637392d9a1fb4b99e012ab7671db40bb916fdd027bd521";
+       libraryHaskellDepends = [ base stm text time transformers ];
+       homepage = "https://github.com/k0001/di";
+       description = "Easy and powerful typeful logging without monad towers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dia-base" = callPackage
     ({ mkDerivation, base, deepseq }:
      mkDerivation {
@@ -54929,6 +55201,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "dictionaries_0_2_0_1" = callPackage
+    ({ mkDerivation, attoparsec, base, binary, bytestring, containers
+     , criterion, data-default, deepseq, directory, exceptions, filepath
+     , hspec, QuickCheck, random, random-shuffle, tagged, text, time
+     , transformers, zlib
+     }:
+     mkDerivation {
+       pname = "dictionaries";
+       version = "0.2.0.1";
+       sha256 = "0a74b9b26ae8f625fb66c81fa58187f8771d95a4721539198f0ef15745877e4b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base binary bytestring containers data-default deepseq
+         directory exceptions filepath tagged text time transformers zlib
+       ];
+       executableHaskellDepends = [
+         base bytestring containers criterion deepseq directory exceptions
+         filepath random random-shuffle tagged text transformers
+       ];
+       testHaskellDepends = [
+         base bytestring containers directory filepath hspec QuickCheck
+         random tagged text time
+       ];
+       description = "Tools to handle StarDict dictionaries";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dictionary-sharing" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -55375,6 +55676,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dihaa" = callPackage
+    ({ mkDerivation, base, FontyFruity, JuicyPixels, Rasterific, vector
+     }:
+     mkDerivation {
+       pname = "dihaa";
+       version = "0.2.1.2";
+       sha256 = "93d6dd6879ee589a6cfcf33c884012a92e8f1fc1d3c37c44a719699cab1c29c6";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base FontyFruity JuicyPixels Rasterific vector
+       ];
+       homepage = "http://sha-bang.de";
+       description = "ASCII based Diagram drawing in Haskell (Idea based on ditaa)";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "dimensional" = callPackage
     ({ mkDerivation, base, criterion, deepseq, exact-pi, HUnit
      , numtype-dk, vector
@@ -57492,6 +57810,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "dotenv_0_3_3_0" = callPackage
+    ({ mkDerivation, base, base-compat, exceptions, hspec
+     , hspec-megaparsec, megaparsec, optparse-applicative, process, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "dotenv";
+       version = "0.3.3.0";
+       sha256 = "ef451c16c6d00dd8a51e4ff414a297d93dbe94596d2d0baaa1a5e5e118a3d3d8";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base-compat exceptions megaparsec text transformers
+       ];
+       executableHaskellDepends = [
+         base base-compat megaparsec optparse-applicative process text
+         transformers
+       ];
+       testHaskellDepends = [
+         base base-compat exceptions hspec hspec-megaparsec megaparsec text
+         transformers
+       ];
+       homepage = "https://github.com/stackbuilders/dotenv-hs";
+       description = "Loads environment variables from dotenv files";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dotfs" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , haskell-src, HFuse, HUnit, parsec, process, QuickCheck
@@ -58342,6 +58688,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "duckling" = callPackage
+    ({ mkDerivation, aeson, array, attoparsec, base, bytestring
+     , containers, deepseq, dependent-sum, directory, extra, filepath
+     , hashable, haskell-src-exts, regex-base, regex-pcre, snap-core
+     , snap-server, tasty, tasty-hunit, text, text-show, time
+     , timezone-olson, timezone-series, unordered-containers
+     }:
+     mkDerivation {
+       pname = "duckling";
+       version = "0.1.0.0";
+       sha256 = "785746f36d9ed14aa74a34a9f0747e1eb039638ca316cf6fb3dba894bc3d009a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson array attoparsec base bytestring containers deepseq
+         dependent-sum extra hashable regex-base regex-pcre text text-show
+         time timezone-series unordered-containers
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring directory extra filepath haskell-src-exts
+         snap-core snap-server text text-show time timezone-olson
+         timezone-series unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base tasty tasty-hunit text time unordered-containers
+       ];
+       homepage = "https://github.com/facebookincubator/duckling#readme";
+       description = "A Haskell library for parsing text into structured data";
+       license = "unknown";
+     }) {};
+
   "dump" = callPackage
     ({ mkDerivation, base, haskell-src-meta, hspec
      , interpolatedstring-perl6, QuickCheck, template-haskell, text
@@ -61079,26 +61456,47 @@ self: {
      }) {};
 
   "enumerate" = callPackage
-    ({ mkDerivation, array, base, containers, deepseq, doctest
-     , ghc-prim, template-haskell, vinyl
+    ({ mkDerivation, array, base, containers, deepseq, ghc-prim, spiros
+     , template-haskell, vinyl
      }:
      mkDerivation {
        pname = "enumerate";
-       version = "0.2.1";
-       sha256 = "94a61aa2c25ef3ad6f3ccb7edd9899bfac771b11f138428d15d9c27a52c04f10";
+       version = "0.2.2";
+       sha256 = "6118e432610acad38927bb3445bc962fd40c45c2825fda67b812dff18b92c588";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         array base containers deepseq ghc-prim template-haskell vinyl
+         array base containers deepseq ghc-prim spiros template-haskell
+         vinyl
        ];
        executableHaskellDepends = [ base ];
-       testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/sboosali/enumerate";
        description = "enumerate all the values in a finite type (automatically)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "enumerate-function" = callPackage
+    ({ mkDerivation, base, containers, criterion, deepseq, doctest
+     , enumerate, exceptions, hspec, MemoTrie, QuickCheck, semigroups
+     }:
+     mkDerivation {
+       pname = "enumerate-function";
+       version = "0.0.1";
+       sha256 = "fd26862703d317da7ed600369c8decee4e339feb4ff4fddb93b61ae1e436c032";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers deepseq enumerate exceptions MemoTrie semigroups
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest hspec QuickCheck ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
+       homepage = "http://github.com/sboosali/enumerate-function#readme";
+       description = "simple package for inverting functions and testing totality, via brute enumeration of the domain";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "enumeration" = callPackage
     ({ mkDerivation, arith-encode, arithmoi, base, binary, Cabal
      , containers, heap, HUnit-Plus
@@ -62128,6 +62526,8 @@ self: {
        pname = "ether";
        version = "0.5.0.0";
        sha256 = "cee27d3d697de46be906553022e748477bbc60412901ae190d0ab64ad788f27a";
+       revision = "1";
+       editedCabalFile = "a58e537c5e544c0054c4baf64ac4bb8ecac4d1e285d0a6738a764e4183d36b50";
        libraryHaskellDepends = [
          base exceptions mmorph monad-control mtl reflection tagged
          template-haskell transformers transformers-base transformers-lift
@@ -62528,8 +62928,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventloop";
-       version = "0.8.2.3";
-       sha256 = "5867c9f778f0947301cddd83cd940f08daa2689b9a5bac3cc268806fde08cf2b";
+       version = "0.8.2.4";
+       sha256 = "42fe6785d6c9d2eec13d909d4b49614c9c3059b11dd7e8560dbeaf504edbff07";
        libraryHaskellDepends = [
          aeson base bytestring concurrent-utilities deepseq network stm
          suspend text timers websockets
@@ -62546,8 +62946,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventsource-api";
-       version = "1.0.2";
-       sha256 = "d97fc24411bb872084ad41b2113070c8b576b3a055ed918e7880993c5fd64107";
+       version = "1.1.0";
+       sha256 = "a9c79ab3819ecf883be88d2ac9a1465c564bdb580eebcecf18e92e2a3eba0d4e";
        libraryHaskellDepends = [
          aeson base containers mtl protolude unordered-containers uuid
        ];
@@ -62563,8 +62963,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventsource-geteventstore-store";
-       version = "1.0.0";
-       sha256 = "d14e33e0f73d2c6344d251253cd9f29551dd08ed627fa9b68845ac8e236dbafb";
+       version = "1.0.1";
+       sha256 = "d0da118c13356cfb15b83a175fca6f703f382650ead2606209499425dade07a6";
        libraryHaskellDepends = [
          aeson base eventsource-api eventstore mtl protolude
        ];
@@ -62600,8 +63000,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventsource-stub-store";
-       version = "1.0.0";
-       sha256 = "6c50fd40a886098fb95f129d4769b68ffe3ffdb9135234d4db921ff6f5d17fef";
+       version = "1.0.1";
+       sha256 = "f3a0e17be29259a7a38a6666f7e3cb51df005165ffd87a3bf1cee8fea6f7d54e";
        libraryHaskellDepends = [
          base containers eventsource-api mtl protolude stm
        ];
@@ -62661,6 +63061,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "every" = callPackage
+    ({ mkDerivation, async, base, stm }:
+     mkDerivation {
+       pname = "every";
+       version = "0.0.1";
+       sha256 = "5d0ff0e4cefb094c44b55defa283146b16b925722a2eb244a5ef4364737980e5";
+       libraryHaskellDepends = [ async base stm ];
+       homepage = "https://github.com/athanclark/every#readme";
+       description = "Run a process every so often";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "every-bit-counts" = callPackage
     ({ mkDerivation, base, haskell98 }:
      mkDerivation {
@@ -62819,8 +63231,8 @@ self: {
      }:
      mkDerivation {
        pname = "exception-monads-tf";
-       version = "0.4";
-       sha256 = "0fa6b5abb40ae3b1cb8664cd955ec37d7ff17e73ccddacdeebbc5bf2806a2a4d";
+       version = "0.4.0.1";
+       sha256 = "4443f16b64d34d21b6bd609e3ad605cccf89277b9990e6226283e7ccc952c1f1";
        libraryHaskellDepends = [
          base exception-transformers monads-tf transformers
        ];
@@ -63652,6 +64064,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "extractable-singleton" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "extractable-singleton";
+       version = "0.0.1";
+       sha256 = "e8da1928d98c57ef3d1bab7deb1378f51fa496721495777233663dd0b1b2c0ad";
+       libraryHaskellDepends = [ base transformers ];
+       homepage = "https://github.com/athanclark/extractable-singleton#readme";
+       description = "A functor, where the \"stored\" value is isomorphic to Identity";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "extractelf" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-mmap, directory, elf
      , filepath, optparse-applicative
@@ -66540,6 +66964,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "flight-igc" = callPackage
+    ({ mkDerivation, base, cmdargs, directory, filemanip, filepath
+     , hlint, mtl, parsec, raw-strings-qq, system-filepath, transformers
+     }:
+     mkDerivation {
+       pname = "flight-igc";
+       version = "0.1.0";
+       sha256 = "b49fb55aad039256377fcc2280519553171ff5c141da8f5e06f1dfca612f22b3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base parsec ];
+       executableHaskellDepends = [
+         base cmdargs directory filemanip filepath mtl raw-strings-qq
+         system-filepath transformers
+       ];
+       testHaskellDepends = [ base hlint ];
+       homepage = "https://github.com/BlockScope/haskell-flight-igc#readme";
+       description = "A parser for IGC files";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "flippers" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -67574,8 +68019,8 @@ self: {
        pname = "forma";
        version = "0.1.0";
        sha256 = "4ae9efb4ca4bc806e8d700ad2532d17a3002b532e5fb05fab7d3582842de5881";
-       revision = "1";
-       editedCabalFile = "48b96ffd6c0e0db34b5eba95f69349a94f72004e5d56b17e486c91850f38fdf1";
+       revision = "2";
+       editedCabalFile = "c25110d939fd9d46b4d647c2f4965ec4b2ceb676da97dd0f8b9d7055d018be03";
        libraryHaskellDepends = [
          aeson base containers data-default-class mtl text
          unordered-containers
@@ -67905,6 +68350,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "foundation_0_0_9" = callPackage
+    ({ mkDerivation, base, criterion, ghc-prim, mtl, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "foundation";
+       version = "0.0.9";
+       sha256 = "db9672c17b79d3c5e620aaba6699c6707fa647cb54961d1ac147d980f2255196";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [
+         base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/haskell-foundation/foundation";
+       description = "Alternative prelude with batteries and no dependencies";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "foundation-edge" = callPackage
     ({ mkDerivation, bytestring, foundation, text }:
      mkDerivation {
@@ -68831,6 +69295,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "frpnow-gtk3" = callPackage
+    ({ mkDerivation, base, containers, frpnow, glib, gtk3, mtl, text }:
+     mkDerivation {
+       pname = "frpnow-gtk3";
+       version = "0.2.0";
+       sha256 = "e065a5ef7227c2ebc74c63eade6004adaaa9f99bcc2f88e44b17485f0bcab786";
+       libraryHaskellDepends = [
+         base containers frpnow glib gtk3 mtl text
+       ];
+       homepage = "https://github.com/george-steel/frpnow-gtk3";
+       description = "Program GUIs with GTK3 and frpnow!";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "frquotes" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -69367,6 +69845,8 @@ self: {
        pname = "functor-classes-compat";
        version = "1";
        sha256 = "ef11f94f44a74d6657ee61dcd2cfbc6d0889d233a2fb4caae6a29d9c59a1366f";
+       revision = "1";
+       editedCabalFile = "14c1e7fd585522284429b627efea55737f0e536edc9e0d9e7fa00810805f7411";
        libraryHaskellDepends = [
          base containers hashable unordered-containers vector
        ];
@@ -71660,6 +72140,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-exactprint_0_5_3_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, Diff, directory
+     , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
+     , silently, syb
+     }:
+     mkDerivation {
+       pname = "ghc-exactprint";
+       version = "0.5.3.1";
+       sha256 = "54f2b83a8643e25654e4dfaf236938021e37c82e22d589d45ffb43aef2483772";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers directory filepath free ghc ghc-boot
+         ghc-paths mtl syb
+       ];
+       testHaskellDepends = [
+         base bytestring containers Diff directory filemanip filepath ghc
+         ghc-boot ghc-paths HUnit mtl silently syb
+       ];
+       description = "ExactPrint for GHC";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-gc-tune" = callPackage
     ({ mkDerivation, base, directory, filepath, process }:
      mkDerivation {
@@ -73584,8 +74088,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20170321";
-       sha256 = "f86351a99bbfff0285914c4639d2bc68ffcc172a6dacdef164254261cf1f0795";
+       version = "6.20170510";
+       sha256 = "f85f4e0fb737daeb38bdd420daabaff7862e16bdf4e237d93be28649b7d00512";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -74893,24 +75397,25 @@ self: {
 
   "glirc" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring
-     , bytestring, Cabal, config-value, containers, directory, filepath
-     , gitrev, hashable, hookup, HsOpenSSL, HUnit, irc-core
-     , kan-extensions, lens, network, process, regex-tdfa, socks, split
-     , stm, text, time, transformers, unix, unordered-containers, vector
-     , vty
+     , bytestring, Cabal, config-schema, config-value, containers
+     , directory, filepath, gitrev, hashable, hookup, HsOpenSSL, HUnit
+     , irc-core, kan-extensions, lens, network, process, regex-tdfa
+     , semigroupoids, socks, split, stm, text, time, transformers, unix
+     , unordered-containers, vector, vty
      }:
      mkDerivation {
        pname = "glirc";
-       version = "2.20.5";
-       sha256 = "c015050463c6bbad19c4f27aefeded06f00516e31f2249f8b2b0f4202cf9c8dd";
+       version = "2.20.6";
+       sha256 = "b119e13c00eab6b28da3fad4f66545d0804299795447f6fdccc41f328a434c20";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
        libraryHaskellDepends = [
-         async attoparsec base base64-bytestring bytestring config-value
-         containers directory filepath gitrev hashable hookup HsOpenSSL
-         irc-core kan-extensions lens network process regex-tdfa socks split
-         stm text time transformers unix unordered-containers vector vty
+         async attoparsec base base64-bytestring bytestring config-schema
+         config-value containers directory filepath gitrev hashable hookup
+         HsOpenSSL irc-core kan-extensions lens network process regex-tdfa
+         semigroupoids socks split stm text time transformers unix
+         unordered-containers vector vty
        ];
        executableHaskellDepends = [ base lens text vty ];
        testHaskellDepends = [ base HUnit ];
@@ -79652,6 +80157,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "graphted" = callPackage
+    ({ mkDerivation, base, indexed }:
+     mkDerivation {
+       pname = "graphted";
+       version = "0.3.1.0";
+       sha256 = "89190037cd56a3a083c7bd62186d02a282d0319e31c7d00f07ab33fcbcc65678";
+       libraryHaskellDepends = [ base indexed ];
+       homepage = "https://github.com/aaronfriel/graphted#readme";
+       description = "Graph indexed monads";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "graphtype" = callPackage
     ({ mkDerivation, base, containers, dotgen, haskell-src-exts
      , haskell98, uniplate
@@ -79696,6 +80213,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "graphviz_2999_19_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, colour, containers, criterion
+     , deepseq, directory, dlist, fgl, fgl-arbitrary, filepath
+     , polyparse, process, QuickCheck, temporary, text, transformers
+     , wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "graphviz";
+       version = "2999.19.0.0";
+       sha256 = "af0a7ff197c9de3f23e6653541446f755c824083ced04b629df6d19523fe04ea";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring colour containers directory dlist fgl filepath
+         polyparse process temporary text transformers wl-pprint-text
+       ];
+       testHaskellDepends = [
+         base containers fgl fgl-arbitrary filepath QuickCheck text
+       ];
+       benchmarkHaskellDepends = [ base criterion deepseq text ];
+       homepage = "http://projects.haskell.org/graphviz/";
+       description = "Bindings to Graphviz for graph visualisation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "graql" = callPackage
     ({ mkDerivation, aeson, base, containers, hspec, markdown-unlit
      , process, regex-posix, scientific, text
@@ -80421,8 +80964,8 @@ self: {
      }:
      mkDerivation {
        pname = "gssapi";
-       version = "0.1.0.0";
-       sha256 = "72b7c687414bb370ff6a857ddbcfe00a804d3f2e4ca563c0783a68f6f875b0fd";
+       version = "0.2.0.0";
+       sha256 = "9ecfeba4b0d7aa5d14a82026f2693bb5d6225322915c65ce659bf1510bf07ecf";
        libraryHaskellDepends = [ base bytestring resourcet transformers ];
        librarySystemDepends = [ gssapi_krb5 krb5 ];
        homepage = "https://github.com/ondrap/gssapi";
@@ -80437,8 +80980,8 @@ self: {
      }:
      mkDerivation {
        pname = "gssapi-wai";
-       version = "0.1.0.1";
-       sha256 = "12ec5a79ae4da85c7117edefc2a6b37790c7d4cf65ae04e89541de7709ee7a8e";
+       version = "0.1.2.1";
+       sha256 = "9666151c6ca4fbd8d167230cd30c45ae0cc628114e85e4ec8d3a7f4171492259";
        libraryHaskellDepends = [
          base base64-bytestring bytestring case-insensitive gssapi
          http-types vault wai wai-extra
@@ -81163,6 +81706,22 @@ self: {
      }) {cudd = null; epd = null; inherit (pkgs) mtr; 
          inherit (pkgs) st; util = null;};
 
+  "hCM" = callPackage
+    ({ mkDerivation, base, hashable, haskell-src }:
+     mkDerivation {
+       pname = "hCM";
+       version = "0.1.0.0";
+       sha256 = "4c520f70cab14412476c1cd5130a747f628522e11dd3059d712cb52b58a1ab39";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base hashable haskell-src ];
+       executableHaskellDepends = [ base hashable ];
+       testHaskellDepends = [ base hashable ];
+       homepage = "https://github.com/MarekSuchanek/hCM";
+       description = "Conceptual modelling support for Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hCsound" = callPackage
     ({ mkDerivation, base, c2hs, csound64, libsndfile, monads-tf
      , transformers, vector
@@ -86076,8 +86635,8 @@ self: {
     ({ mkDerivation, base, containers, gloss }:
      mkDerivation {
        pname = "haskell-go-checkers";
-       version = "0.1.0.0";
-       sha256 = "0bf488fcce071ecd545025f0804e9b7287fdde4c094ce8bb82afa46738c7ac49";
+       version = "0.1.1.0";
+       sha256 = "a2c11c448750cfd3b2490fae59211f43c85e716e8c7566ff7fdffece021fd2ac";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers gloss ];
@@ -86645,6 +87204,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskell-src-meta_0_8" = callPackage
+    ({ mkDerivation, base, haskell-src-exts, HUnit, pretty, syb
+     , template-haskell, test-framework, test-framework-hunit
+     , th-orphans
+     }:
+     mkDerivation {
+       pname = "haskell-src-meta";
+       version = "0.8";
+       sha256 = "9d08ad3d5e765b54f9e0d77638b0bef6e25f83274962c7502941e7e71eeb694f";
+       libraryHaskellDepends = [
+         base haskell-src-exts pretty syb template-haskell th-orphans
+       ];
+       testHaskellDepends = [
+         base haskell-src-exts HUnit pretty template-haskell test-framework
+         test-framework-hunit
+       ];
+       description = "Parse source to template-haskell abstract syntax";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-src-meta-mwotton" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, haskell-src-exts
      , pretty, syb, template-haskell
@@ -86717,14 +87297,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskell-tools-ast_0_6_0_0" = callPackage
+  "haskell-tools-ast_0_7_0_0" = callPackage
     ({ mkDerivation, base, ghc, mtl, references, template-haskell
      , uniplate
      }:
      mkDerivation {
        pname = "haskell-tools-ast";
-       version = "0.6.0.0";
-       sha256 = "bb3669b5fb70875551a29efd781e58408c26107eb26f1a4b41d8123a9f7dd6a6";
+       version = "0.7.0.0";
+       sha256 = "db3b51d417711960b454811cddf5fa18a52b5a0d26f43fb21e104effbb487918";
        libraryHaskellDepends = [
          base ghc mtl references template-haskell uniplate
        ];
@@ -86807,15 +87387,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskell-tools-backend-ghc_0_6_0_0" = callPackage
+  "haskell-tools-backend-ghc_0_7_0_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, ghc
      , haskell-tools-ast, mtl, references, safe, split, template-haskell
      , transformers, uniplate
      }:
      mkDerivation {
        pname = "haskell-tools-backend-ghc";
-       version = "0.6.0.0";
-       sha256 = "1bc88d278a314207ebe47cc8a85cebf6b6cd6d835f858e45be2d0cc663a40d96";
+       version = "0.7.0.0";
+       sha256 = "eff7ebe8b307f845103cbc0d543342f3730e9cf7187db6603ac950f73978c025";
        libraryHaskellDepends = [
          base bytestring containers ghc haskell-tools-ast mtl references
          safe split template-haskell transformers uniplate
@@ -86856,7 +87436,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskell-tools-cli_0_6_0_0" = callPackage
+  "haskell-tools-cli_0_7_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , directory, filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-prettyprint, haskell-tools-refactor, knob, mtl
@@ -86864,8 +87444,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-cli";
-       version = "0.6.0.0";
-       sha256 = "fe6da0d9a8cfd42ff74579bbfe7d727a64f4e3b8b99770920877a0ddcee6d786";
+       version = "0.7.0.0";
+       sha256 = "f69f047da3fe211b21ac3f493ac375b45d60ce7f3d0e425826d353ce9882cfd6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -86914,7 +87494,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskell-tools-daemon_0_6_0_0" = callPackage
+  "haskell-tools-daemon_0_7_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, Diff
      , directory, filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-prettyprint, haskell-tools-refactor, HUnit, mtl
@@ -86922,8 +87502,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-daemon";
-       version = "0.6.0.0";
-       sha256 = "25500cc2877eb692cb70905b8f52fc4934ead7030d1acad4165a663dc59e7545";
+       version = "0.7.0.0";
+       sha256 = "fc67b08913e0be54f0cf199e5be5b1306b1586d7e9f8c531810d7fd66a664c27";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -86964,15 +87544,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskell-tools-debug_0_6_0_0" = callPackage
+  "haskell-tools-debug_0_7_0_0" = callPackage
     ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-backend-ghc, haskell-tools-prettyprint
      , haskell-tools-refactor, references, template-haskell
      }:
      mkDerivation {
        pname = "haskell-tools-debug";
-       version = "0.6.0.0";
-       sha256 = "e7c1d57bf0399e5421cff93a7873eb762fc428d0165a18512ef6a755b40f3a80";
+       version = "0.7.0.0";
+       sha256 = "b1248453f74385a5fa3719077b67d630479e20cecbc10969656f280fbfc914c7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -87018,7 +87598,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskell-tools-demo_0_6_0_0" = callPackage
+  "haskell-tools-demo_0_7_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-backend-ghc, haskell-tools-prettyprint
@@ -87028,8 +87608,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-demo";
-       version = "0.6.0.0";
-       sha256 = "d914bcd4e1e5eb9bee7dcb309847a075ee218c995bc1614bdf0f1ef7a10a1547";
+       version = "0.7.0.1";
+       sha256 = "e48b65a92440f65d8450864fa21683290e7c0ae7fcc9847f3b89f7bcd929c505";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -87066,14 +87646,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskell-tools-prettyprint_0_6_0_0" = callPackage
+  "haskell-tools-prettyprint_0_7_0_0" = callPackage
     ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl
      , references, split, text, uniplate
      }:
      mkDerivation {
        pname = "haskell-tools-prettyprint";
-       version = "0.6.0.0";
-       sha256 = "3940d50675b96c29a45a8682effb22a65bf49711dc44deaafcf46272d1c821f8";
+       version = "0.7.0.0";
+       sha256 = "4c570562e8947cec5668aa0423b3fe15799cdeef165c8083ced1f78947c9aa34";
        libraryHaskellDepends = [
          base containers ghc haskell-tools-ast mtl references split text
          uniplate
@@ -87115,7 +87695,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskell-tools-refactor_0_6_0_0" = callPackage
+  "haskell-tools-refactor_0_7_0_0" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, either
      , filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-backend-ghc, haskell-tools-prettyprint
@@ -87125,8 +87705,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-refactor";
-       version = "0.6.0.0";
-       sha256 = "1a339d0571d78a94099cd442bf0865cb30df3b7054e7c75d7a5a20effbf94087";
+       version = "0.7.0.0";
+       sha256 = "2681a53191f41ebd4e85831dfcbad5caa15ed7cdd8ff16bc187d72deec5c3b5a";
        libraryHaskellDepends = [
          base Cabal containers directory filepath ghc ghc-paths
          haskell-tools-ast haskell-tools-backend-ghc
@@ -87169,15 +87749,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskell-tools-rewrite_0_6_0_0" = callPackage
+  "haskell-tools-rewrite_0_7_0_0" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, ghc
      , haskell-tools-ast, haskell-tools-prettyprint, mtl, references
      , tasty, tasty-hunit
      }:
      mkDerivation {
        pname = "haskell-tools-rewrite";
-       version = "0.6.0.0";
-       sha256 = "3a328de2b8df98fdb7e10308daf31b3ca8be401ad8df3b26887f2035642705f7";
+       version = "0.7.0.0";
+       sha256 = "170907b0018d7102119716dd81f92f7c18c9388d27c4b15d660ef2108e23f401";
        libraryHaskellDepends = [
          base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl
          references
@@ -87940,7 +88520,7 @@ self: {
      }) {};
 
   "haskoin-core" = callPackage
-    ({ mkDerivation, aeson, base, base16-bytestring, byteable
+    ({ mkDerivation, aeson, base, base16-bytestring, binary, byteable
      , bytestring, cereal, conduit, containers, cryptohash, deepseq
      , either, entropy, HUnit, largeword, mtl, murmur3, network, pbkdf
      , QuickCheck, safe, scientific, secp256k1, split
@@ -87950,8 +88530,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-core";
-       version = "0.4.0";
-       sha256 = "151f82fd98b3527a873af081acecc8585a747f077e3513597d1c85921ee3eff1";
+       version = "0.4.2";
+       sha256 = "f35bce54c208c7445fa0588eb945c207a2eeff3cb1c5e1ae854afa876752d45b";
        libraryHaskellDepends = [
          aeson base base16-bytestring byteable bytestring cereal conduit
          containers cryptohash deepseq either entropy largeword mtl murmur3
@@ -87959,7 +88539,7 @@ self: {
          time vector
        ];
        testHaskellDepends = [
-         aeson base bytestring cereal containers HUnit largeword mtl
+         aeson base binary bytestring cereal containers HUnit largeword mtl
          QuickCheck safe scientific secp256k1 split string-conversions
          test-framework test-framework-hunit test-framework-quickcheck2 text
          unordered-containers vector
@@ -88007,8 +88587,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-node";
-       version = "0.4.0";
-       sha256 = "e4e021ba7c2be81410866301eb0efe672fa258825675f882f032af0a50cbc96b";
+       version = "0.4.2";
+       sha256 = "3aa1a48e25660a03d08650e536606ae0fb5981275a2a3a4333e1508c4b6e0f4e";
        libraryHaskellDepends = [
          aeson async base bytestring cereal concurrent-extra conduit
          conduit-extra containers data-default deepseq either esqueleto
@@ -88110,8 +88690,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-wallet";
-       version = "0.4.0";
-       sha256 = "9bc185a7e5571c3ae7e2c34acc4345cbe808d1a314208795ef7f89c6cf3a0b09";
+       version = "0.4.2";
+       sha256 = "a536ec4620ac54f603bf249a5f66557b2c2cc1a645346e1ff9b726e371f9727a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -88123,7 +88703,10 @@ self: {
          stm stm-chans stm-conduit string-conversions text time
          transformers-base unix unordered-containers yaml zeromq4-haskell
        ];
-       executableHaskellDepends = [ base ];
+       executableHaskellDepends = [
+         aeson aeson-pretty base haskoin-node monad-logger persistent-sqlite
+         resourcet string-conversions unordered-containers zeromq4-haskell
+       ];
        testHaskellDepends = [
          aeson base bytestring containers directory haskoin-core
          haskoin-node HUnit monad-logger mtl persistent persistent-sqlite
@@ -90260,19 +90843,19 @@ self: {
   "hedgehog" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring
      , concurrent-output, containers, directory, exceptions, mmorph, mtl
-     , pretty-show, primitive, random, resourcet, template-haskell, text
-     , th-lift, time, transformers, transformers-base
+     , pretty-show, primitive, random, resourcet, stm, template-haskell
+     , text, th-lift, time, transformers, transformers-base, unix
      , wl-pprint-annotated
      }:
      mkDerivation {
        pname = "hedgehog";
-       version = "0.1";
-       sha256 = "4d098f3162f92fe26d15cb589f17ce83c627c4591d155475afcb97161938d8a5";
+       version = "0.2.1";
+       sha256 = "1d14d2ac5adf566dd7711bc2978723dd5dc4976dcd472d2d22ab3f6a23488b0d";
        libraryHaskellDepends = [
          ansi-terminal async base bytestring concurrent-output containers
          directory exceptions mmorph mtl pretty-show primitive random
-         resourcet template-haskell text th-lift time transformers
-         transformers-base wl-pprint-annotated
+         resourcet stm template-haskell text th-lift time transformers
+         transformers-base unix wl-pprint-annotated
        ];
        testHaskellDepends = [
          base containers pretty-show text transformers
@@ -92665,8 +93248,8 @@ self: {
      }:
      mkDerivation {
        pname = "hindent";
-       version = "5.2.2";
-       sha256 = "1fc9a92a501552b17219a13fd691e380cc2e2bbf4d768788f13b47639ff4237d";
+       version = "5.2.3";
+       sha256 = "931f097182c1633fddfb63896df7aeef9ba8447870b27616c0216f86df7c4cf2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92686,7 +93269,7 @@ self: {
          base bytestring criterion deepseq directory exceptions ghc-prim
          haskell-src-exts utf8-string
        ];
-       homepage = "http://www.github.com/chrisdone/hindent";
+       homepage = "https://github.com/commercialhaskell/hindent";
        description = "Extensible Haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -93694,6 +94277,8 @@ self: {
        pname = "hledger-iadd";
        version = "1.2.1";
        sha256 = "bc2636fbdce63f62b29ef9cba4e876469b4a040b0b10d2d4575927ef186a591e";
+       revision = "1";
+       editedCabalFile = "a67b31eaa0a5916a3a1b529628aeb736b8db08586f0b3a519c360ead13d78c84";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -93967,7 +94552,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hlint_2_0_5" = callPackage
+  "hlint_2_0_6" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, cmdargs
      , containers, cpphs, directory, extra, filepath, haskell-src-exts
      , hscolour, process, refact, text, transformers, uniplate
@@ -93975,8 +94560,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "2.0.5";
-       sha256 = "fc3517275a2878a25a6463a6e8f8492b7b525adb5f3e6099ff388e9bc280a6b1";
+       version = "2.0.6";
+       sha256 = "def386e6e9a3866541316c20b158e9d652ac48c3fd8e4f60c1848286393da27a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -95402,8 +95987,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoogle";
-       version = "5.0.10";
-       sha256 = "eb6eec27ceb6f4d70757353156a70cc6501e7424db581bf3aba100555ed48a84";
+       version = "5.0.12";
+       sha256 = "1d37f1e96b699fe71ea3661ac2a9424cfd178cba5cc26b0a7ee5505e6fb49308";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -96452,13 +97037,13 @@ self: {
     ({ mkDerivation, base, random }:
      mkDerivation {
        pname = "hpg";
-       version = "0.4";
-       sha256 = "4a6f436fe9dbd5ee5ae2b996c45c60895b8f7adae33e0aae71ab238bdc768710";
+       version = "0.7";
+       sha256 = "cab810f1851e5eff7386bb97689db0516c1f289d8fb29cd2ba78cdf213444a5c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base random ];
-       homepage = "https://git.alokat.org/hpg";
-       description = "no";
+       homepage = "https://darcs.alokat.org/hpg";
+       description = "a simple password generator";
        license = stdenv.lib.licenses.isc;
      }) {};
 
@@ -98467,6 +99052,21 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "hsemail_2" = callPackage
+    ({ mkDerivation, base, doctest, hspec, mtl, old-time, parsec }:
+     mkDerivation {
+       pname = "hsemail";
+       version = "2";
+       sha256 = "f5f08a879444abd1f9a8a3e620d7fc83bc632ae3ba9b545bebdf58d5f4bfa8d9";
+       libraryHaskellDepends = [ base mtl old-time parsec ];
+       testHaskellDepends = [ base doctest hspec mtl old-time parsec ];
+       homepage = "https://github.com/peti/hsemail#readme";
+       description = "Parsec parsers for the RFC2822 Internet Message format";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
   "hsemail-ns" = callPackage
     ({ mkDerivation, base, mtl, old-time, parsec }:
      mkDerivation {
@@ -100529,6 +101129,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hsudoku" = callPackage
+    ({ mkDerivation, base, bytestring, gi-gtk, HandsomeSoup
+     , haskell-gi-base, hspec, http-client, http-client-tls, hxt
+     , QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "hsudoku";
+       version = "0.1.0.0";
+       sha256 = "d4f82611b75c8da0c9ac4ede33c2e22bd23853e54fd09362adc4911047139e29";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring gi-gtk HandsomeSoup haskell-gi-base http-client
+         http-client-tls hxt text
+       ];
+       executableHaskellDepends = [
+         base bytestring gi-gtk HandsomeSoup haskell-gi-base http-client
+         http-client-tls hxt text
+       ];
+       testHaskellDepends = [
+         base bytestring gi-gtk HandsomeSoup haskell-gi-base hspec
+         http-client http-client-tls hxt QuickCheck text
+       ];
+       homepage = "https://github.com/marcelmoosbrugger/hsudoku";
+       description = "Sudoku game with a GTK3 interface";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hsverilog" = callPackage
     ({ mkDerivation, base, containers, hspec, hspec-contrib
      , hspec-expectations-lifted, shakespeare, text, transformers
@@ -100626,6 +101254,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hsx2hs_0_14_1" = callPackage
+    ({ mkDerivation, base, bytestring, haskell-src-exts
+     , haskell-src-meta, mtl, template-haskell, utf8-string
+     }:
+     mkDerivation {
+       pname = "hsx2hs";
+       version = "0.14.1";
+       sha256 = "e3b0031c84e32805a0f941beb1c2338e2e8497bb44847b81d077d268bbfe39a4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring haskell-src-exts haskell-src-meta mtl
+         template-haskell utf8-string
+       ];
+       homepage = "https://github.com/seereason/hsx2hs";
+       description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hsyscall" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -103123,6 +103771,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-prim_0_4_0_3" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }:
+     mkDerivation {
+       pname = "hw-prim";
+       version = "0.4.0.3";
+       sha256 = "540976d93138dae0863a02ba4ab063ba3d1484677a66990c7bd2c3fc3d8d4500";
+       libraryHaskellDepends = [ base bytestring vector ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck vector ];
+       homepage = "http://github.com/haskell-works/hw-prim#readme";
+       description = "Primitive functions and data types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-rankselect" = callPackage
     ({ mkDerivation, base, hspec, hw-balancedparens, hw-bits, hw-prim
      , hw-rankselect-base, QuickCheck, vector
@@ -104805,8 +105467,10 @@ self: {
      }:
      mkDerivation {
        pname = "identifiers";
-       version = "0.4.1.0";
-       sha256 = "8ba63f3a52712f2296d8dc1737593560c38055a54f2745d3a9c465269d25b38c";
+       version = "0.4.2.0";
+       sha256 = "332e02870c89fbde48f9548212d35f56634c36cef86fecd6520918a3104e1331";
+       revision = "1";
+       editedCabalFile = "85462e8b234f7ed99ea678133f60e0d31d512403f1b9ea614b716687652d2d08";
        libraryHaskellDepends = [
          base binary cereal containers deepseq hashable ListLike text
          unordered-containers
@@ -105600,8 +106264,8 @@ self: {
      }:
      mkDerivation {
        pname = "imap";
-       version = "0.3.0.0";
-       sha256 = "df9d551e51416efea48bc31f3d31096c9dfb94ad3dc0231f74b5ae5b65d26d28";
+       version = "0.3.0.2";
+       sha256 = "0af38b918875eecd1062c1deab83819200f9096681a33f955a5a451ef1af8ed5";
        libraryHaskellDepends = [
          attoparsec base bytestring connection containers derive either
          exceptions hslogger list-t network pipes random rolling-queue stm
@@ -107211,8 +107875,8 @@ self: {
      }:
      mkDerivation {
        pname = "interlude-l";
-       version = "0.2.0.0";
-       sha256 = "39707b2d0ad546aa6ff34ad072ab0a231e23dc3c009708c63b0331c3c7f14270";
+       version = "0.2.0.1";
+       sha256 = "686aa99c4385df61c5e4d4617c6abb5d3648266c831c6a262214832ae0ed354b";
        libraryHaskellDepends = [
          aeson base exceptions lens monad-control MonadRandom mtl protolude
          string-conv text transformers witherable
@@ -107640,6 +108304,8 @@ self: {
        pname = "invertible";
        version = "0.2.0.2";
        sha256 = "eee1b66f20190b5cc87122e22c664422df4188b38f81e896e8381bf2f58385a8";
+       revision = "1";
+       editedCabalFile = "0f8afa1cb2be457a47ce089313cc7eb29079e41029a8e9c348421a63590573c9";
        libraryHaskellDepends = [
          base haskell-src-meta invariant lens partial-isomorphisms
          semigroupoids template-haskell transformers TypeCompose
@@ -107832,6 +108498,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "io-streams_1_4_0_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder
+     , deepseq, directory, filepath, HUnit, mtl, network, primitive
+     , process, QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, transformers, vector
+     , zlib, zlib-bindings
+     }:
+     mkDerivation {
+       pname = "io-streams";
+       version = "1.4.0.0";
+       sha256 = "6d393da60cbbbb31ca3cfe6e25beea6a1fd426ed1348723b357c6358f538930e";
+       configureFlags = [ "-fnointeractivetests" ];
+       libraryHaskellDepends = [
+         attoparsec base bytestring bytestring-builder network primitive
+         process text time transformers vector zlib-bindings
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring bytestring-builder deepseq directory
+         filepath HUnit mtl network primitive process QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+         time transformers vector zlib zlib-bindings
+       ];
+       description = "Simple, composable, and easy-to-use stream I/O";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "io-streams-haproxy" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, HUnit, io-streams
      , network, test-framework, test-framework-hunit, transformers
@@ -107840,6 +108533,8 @@ self: {
        pname = "io-streams-haproxy";
        version = "1.0.0.1";
        sha256 = "c4c0c512443e4da45f1a0023acc4ccee820e25c1088c06346abfb31b9e6e927f";
+       revision = "1";
+       editedCabalFile = "88fc85c60d1ac594181bcf6016e7c1ec06c668207618f1a9a5c3304a4113db4b";
        libraryHaskellDepends = [
          attoparsec base bytestring io-streams network transformers
        ];
@@ -108323,6 +109018,8 @@ self: {
        pname = "irc-dcc";
        version = "2.0.1";
        sha256 = "6408a28733743d3463664677c5e3ad72e46c168799dad458988067039f25d2df";
+       revision = "1";
+       editedCabalFile = "b21158a61f284d320425abc4d727b3374e23f5580fc23e994866ce4669851145";
        libraryHaskellDepends = [
          attoparsec base binary bytestring io-streams iproute irc-ctcp mtl
          network path safe-exceptions transformers utf8-string
@@ -111351,17 +112048,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "jvm_0_2_1" = callPackage
+  "jvm_0_2_2" = callPackage
     ({ mkDerivation, base, bytestring, choice, criterion
-     , distributed-closure, hspec, jni, singletons, text, vector
+     , distributed-closure, hspec, jni, singletons, template-haskell
+     , text, vector
      }:
      mkDerivation {
        pname = "jvm";
-       version = "0.2.1";
-       sha256 = "73e7c287e7c31bbc62a61e43de3f2e47a76a161594ed71cd1ba190823bf66faf";
+       version = "0.2.2";
+       sha256 = "53b15e0cc64bf0f8e462ed4083dc0438d1cb545f234a59c312e853c4f130d1f5";
        libraryHaskellDepends = [
-         base bytestring choice distributed-closure jni singletons text
-         vector
+         base bytestring choice distributed-closure jni singletons
+         template-haskell text vector
        ];
        testHaskellDepends = [ base bytestring hspec text ];
        benchmarkHaskellDepends = [ base criterion jni ];
@@ -111677,6 +112375,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "kan-extensions_5_0_2" = callPackage
+    ({ mkDerivation, adjunctions, array, base, comonad, containers
+     , contravariant, distributive, fail, free, mtl, semigroupoids
+     , tagged, transformers
+     }:
+     mkDerivation {
+       pname = "kan-extensions";
+       version = "5.0.2";
+       sha256 = "1c9ede8595424209944e59fd46c1d2edb654758be9a45c1c48a4d3cedf42482e";
+       libraryHaskellDepends = [
+         adjunctions array base comonad containers contravariant
+         distributive fail free mtl semigroupoids tagged transformers
+       ];
+       homepage = "http://github.com/ekmett/kan-extensions/";
+       description = "Kan extensions, Kan lifts, various forms of the Yoneda lemma, and (co)density (co)monads";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "kangaroo" = callPackage
     ({ mkDerivation, array, base }:
      mkDerivation {
@@ -112459,12 +113176,12 @@ self: {
      , keera-hails-mvc-solutions-config, keera-hails-mvc-solutions-gtk
      , keera-hails-mvc-view-gtk, keera-hails-reactive-gtk
      , keera-hails-reactivevalues, MissingK, mtl, network, process, SDL
-     , SDL-mixer, SDL_mixer, setlocale, time, utf8-string
+     , SDL-mixer, setlocale, time, utf8-string
      }:
      mkDerivation {
        pname = "keera-posture";
-       version = "0.2.3";
-       sha256 = "ab35dd2ebf2cd49602cc47e40a35d79f3a2f113214689ad2306ac09d0aee6952";
+       version = "0.2.4.1";
+       sha256 = "7d23ba5b4558a0c770e8c84f7d28e7a1a2914eae81160cfec34ac1cd3a248cbd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -112478,12 +113195,11 @@ self: {
          keera-hails-reactivevalues MissingK mtl network process SDL
          SDL-mixer setlocale time utf8-string
        ];
-       executableSystemDepends = [ SDL_mixer ];
        homepage = "http://keera.co.uk/projects/keera-posture";
        description = "Get notifications when your sitting posture is inappropriate";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) SDL_mixer;};
+     }) {};
 
   "keiretsu" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring
@@ -114374,6 +115090,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "language-c-quote_0_12" = callPackage
+    ({ mkDerivation, alex, array, base, bytestring, containers
+     , exception-mtl, exception-transformers, filepath, happy
+     , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb
+     , symbol, template-haskell, test-framework, test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "language-c-quote";
+       version = "0.12";
+       sha256 = "120a480a7a141fc544e54c654a3a8662966941d1110c8207a37fd49f745c9d93";
+       libraryHaskellDepends = [
+         array base bytestring containers exception-mtl
+         exception-transformers filepath haskell-src-meta mainland-pretty
+         mtl srcloc syb symbol template-haskell
+       ];
+       libraryToolDepends = [ alex happy ];
+       testHaskellDepends = [
+         base bytestring HUnit mainland-pretty srcloc symbol test-framework
+         test-framework-hunit
+       ];
+       homepage = "https://github.com/mainland/language-c-quote";
+       description = "C/CUDA/OpenCL/Objective-C quasiquoting library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-cil" = callPackage
     ({ mkDerivation, base, bool-extras }:
      mkDerivation {
@@ -116544,6 +117286,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) leveldb;};
 
+  "leveldb-haskell_0_6_5" = callPackage
+    ({ mkDerivation, base, bytestring, data-default, directory
+     , exceptions, filepath, leveldb, mtl, QuickCheck, resourcet, tasty
+     , tasty-quickcheck, temporary, transformers
+     }:
+     mkDerivation {
+       pname = "leveldb-haskell";
+       version = "0.6.5";
+       sha256 = "a417b088068deba73a77936c1345302bac7ce06019fb10254857cafad1d76c28";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring data-default exceptions filepath resourcet
+         transformers
+       ];
+       librarySystemDepends = [ leveldb ];
+       testHaskellDepends = [
+         base bytestring data-default directory exceptions mtl QuickCheck
+         tasty tasty-quickcheck temporary transformers
+       ];
+       homepage = "http://github.com/kim/leveldb-haskell";
+       description = "Haskell bindings to LevelDB";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) leveldb;};
+
   "leveldb-haskell-fork" = callPackage
     ({ mkDerivation, base, bytestring, data-default, filepath, hspec
      , hspec-expectations, leveldb, mtl, process, QuickCheck, resourcet
@@ -117024,8 +117792,8 @@ self: {
      }:
      mkDerivation {
        pname = "liblawless";
-       version = "0.21.2";
-       sha256 = "d5bd1d4dae7139857062e9772fc1891a5351d87baed9d01c5faf481a18fe18a8";
+       version = "0.21.3";
+       sha256 = "a72db320e907affe6105d3a6a8403ed57675a94979637de717f7a2c968995010";
        libraryHaskellDepends = [
          aeson base base-unicode-symbols binary boomerang bytestring
          concurrent-machines containers containers-unicode-symbols
@@ -117040,6 +117808,7 @@ self: {
          temporary test-framework test-framework-quickcheck2
          test-framework-th text time transformers
        ];
+       homepage = "https://gitlab.com/theunixman/liblawless";
        description = "Prelude based on protolude for GHC 8 and beyond";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117064,8 +117833,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "libltdl";
-       version = "0.1.1";
-       sha256 = "9327d7108607fecc30803217eb329465a569a1c26c564b49800ceb08e362f828";
+       version = "0.1.1.1";
+       sha256 = "810c7ca2a543efd88778d366f3fcf4e61c201409aa2b7e5ab459bb4608790c3f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -118274,18 +119043,24 @@ self: {
 
   "linklater" = callPackage
     ({ mkDerivation, aeson, base, base-prelude, bytestring, containers
-     , http-types, text, wai, wreq
+     , exceptions, http-types, lens, lens-aeson, mtl, safe-exceptions
+     , tasty, tasty-hunit, text, uri-bytestring, wai, wreq
      }:
      mkDerivation {
        pname = "linklater";
-       version = "3.2.0.0";
-       sha256 = "d9e5370d04d8849aa4c8df68d9a3bc7867c0a679f1a66f858be585e687b98695";
+       version = "4.0.0.2";
+       sha256 = "1f51757dc255643d62392aaeb9263610ca5a52c83c9fa001be0a7e26b478d34f";
        libraryHaskellDepends = [
-         aeson base base-prelude bytestring containers http-types text wai
-         wreq
+         aeson base base-prelude bytestring containers exceptions http-types
+         lens lens-aeson mtl safe-exceptions text uri-bytestring wai wreq
+       ];
+       testHaskellDepends = [
+         aeson base base-prelude bytestring containers exceptions http-types
+         lens lens-aeson mtl safe-exceptions tasty tasty-hunit text
+         uri-bytestring wai wreq
        ];
        homepage = "https://github.com/hlian/linklater";
-       description = "The fast and fun way to write Slack.com bots";
+       description = "A Haskell library for the Slack API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -118624,13 +119399,13 @@ self: {
      , cmdargs, containers, deepseq, directory, dotgen, fgl
      , fgl-visualize, filemanip, filepath, ghc-prim, hashable, intern
      , located-base, mtl, ocaml, parallel, parsec, pretty, process, syb
-     , tasty, tasty-hunit, tasty-rerun, text, text-format, transformers
-     , unordered-containers, z3
+     , tasty, tasty-hunit, tasty-rerun, text, text-format, time
+     , transformers, unordered-containers, z3
      }:
      mkDerivation {
        pname = "liquid-fixpoint";
-       version = "0.5.0.1";
-       sha256 = "7e14475ac33ed81983fb5b0fa2a1ad34ae0f449983f0a9cd432a7aa37875e53c";
+       version = "0.6.0.1";
+       sha256 = "14efb301b7e80f3a2fce43355aa0681935285ef933464b7ec31475ccd9d570fd";
        configureFlags = [ "-fbuild-external" ];
        isLibrary = true;
        isExecutable = true;
@@ -118639,7 +119414,7 @@ self: {
          binary boxes bytestring cereal cmdargs containers deepseq directory
          dotgen fgl fgl-visualize filemanip filepath ghc-prim hashable
          intern located-base mtl parallel parsec pretty process syb text
-         text-format transformers unordered-containers
+         text-format time transformers unordered-containers
        ];
        executableHaskellDepends = [ base ];
        executableSystemDepends = [ ocaml ];
@@ -118654,41 +119429,41 @@ self: {
      }) {inherit (pkgs) ocaml; inherit (pkgs) z3;};
 
   "liquidhaskell" = callPackage
-    ({ mkDerivation, aeson, array, base, bifunctors, bytestring, Cabal
-     , cereal, cmdargs, containers, cpphs, daemons, data-default
-     , deepseq, Diff, directory, filepath, fingertree, ghc, ghc-paths
-     , hashable, hpc, hscolour, liquid-fixpoint, located-base, mtl
-     , network, optparse-applicative, parsec, pretty, process, stm, syb
-     , tagged, tasty, tasty-ant-xml, tasty-hunit, tasty-rerun
-     , template-haskell, temporary, text, time, transformers, unix
+    ({ mkDerivation, aeson, array, base, bifunctors, binary, bytestring
+     , Cabal, cereal, cmdargs, containers, data-default, deepseq, Diff
+     , directory, exceptions, filepath, fingertree, ghc, ghc-boot
+     , ghc-paths, ghc-prim, hashable, hint, hpc, hscolour
+     , liquid-fixpoint, located-base, mtl, optparse-applicative, parsec
+     , pretty, process, QuickCheck, stm, syb, tagged, tasty
+     , tasty-ant-xml, tasty-hunit, tasty-rerun, template-haskell
+     , temporary, text, text-format, th-lift, time, transformers
      , unordered-containers, vector, z3
      }:
      mkDerivation {
        pname = "liquidhaskell";
-       version = "0.6.0.0";
-       sha256 = "4b5d6fc321c7b92b80b84bda67fc34e3f37f44d23dd60828ba9d9e3d7d645696";
-       revision = "1";
-       editedCabalFile = "3de51855d7c0c9dd89e345a9a27ff151baec1140b9e464ae91604cb5a885f4c9";
+       version = "0.8.0.0";
+       sha256 = "2be2896ac98151fa58e0023da586387925163f48b33def001a949e96be2190cb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson array base bifunctors bytestring Cabal cereal cmdargs
-         containers cpphs data-default deepseq Diff directory filepath
-         fingertree ghc ghc-paths hashable hpc hscolour liquid-fixpoint
-         located-base mtl parsec pretty process syb template-haskell
-         temporary text time unordered-containers vector
+         aeson array base bifunctors binary bytestring Cabal cereal cmdargs
+         containers data-default deepseq Diff directory exceptions filepath
+         fingertree ghc ghc-boot ghc-paths ghc-prim hashable hpc hscolour
+         liquid-fixpoint located-base mtl parsec pretty process QuickCheck
+         syb template-haskell temporary text text-format th-lift time
+         transformers unordered-containers vector
        ];
        executableHaskellDepends = [
-         base bytestring cereal cmdargs daemons data-default deepseq
-         directory ghc liquid-fixpoint located-base network pretty process
-         unix unordered-containers
+         base cmdargs deepseq ghc ghc-boot hint liquid-fixpoint located-base
+         pretty process time
        ];
        testHaskellDepends = [
-         base containers directory filepath mtl optparse-applicative process
-         stm tagged tasty tasty-ant-xml tasty-hunit tasty-rerun transformers
+         base containers directory filepath liquid-fixpoint mtl
+         optparse-applicative parsec process stm syb tagged tasty
+         tasty-ant-xml tasty-hunit tasty-rerun text transformers
        ];
        testSystemDepends = [ z3 ];
-       homepage = "http://goto.ucsd.edu/liquidhaskell";
+       homepage = "https://github.com/ucsd-progsys/liquidhaskell";
        description = "Liquid Types for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119657,6 +120432,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "loc" = callPackage
+    ({ mkDerivation, base, containers, doctest, hedgehog, loc-test }:
+     mkDerivation {
+       pname = "loc";
+       version = "0.1.2.0";
+       sha256 = "09de934a2cf447fc6677261ca9dd04ec7443a8c5f66af688200209107d48204f";
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers doctest hedgehog loc-test ];
+       homepage = "https://github.com/chris-martin/haskell-libraries";
+       description = "Types representing line and column positions and ranges in text files";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "loc-test" = callPackage
+    ({ mkDerivation, base, containers, hedgehog, loc }:
+     mkDerivation {
+       pname = "loc-test";
+       version = "0.1.2.0";
+       sha256 = "5ef9fb070181d019fbe963916b9d894fcd90e1850b98df9dda15e7f9dee4c3ba";
+       libraryHaskellDepends = [ base containers hedgehog loc ];
+       homepage = "https://github.com/chris-martin/haskell-libraries";
+       description = "Test-related utilities related to the /loc/ package";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "local-address" = callPackage
     ({ mkDerivation, base, network }:
      mkDerivation {
@@ -119865,7 +120665,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "log_0_8" = callPackage
+  "log_0_9_0_0" = callPackage
     ({ mkDerivation, aeson, base, bloodhound, bytestring, exceptions
      , http-client, http-types, log-base, log-elasticsearch
      , log-postgres, process, random, tasty, tasty-hunit, text, time
@@ -119873,10 +120673,8 @@ self: {
      }:
      mkDerivation {
        pname = "log";
-       version = "0.8";
-       sha256 = "3c48e377d8e25cb6874c1496d8635342dc3c57843d45f1347b4fdfb110d42a52";
-       revision = "1";
-       editedCabalFile = "110b0297ddce3744cffe2749373311677df01d27531bbec528a27744d7aed1ea";
+       version = "0.9.0.0";
+       sha256 = "21ac6c5e03d3407bb8d0fa58a0be23267496dcbdfc6d980ceca5e07cf5f3199a";
        libraryHaskellDepends = [
          base log-base log-elasticsearch log-postgres
        ];
@@ -119972,7 +120770,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "log-elasticsearch_0_8_1" = callPackage
+  "log-elasticsearch_0_9_0_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
      , bloodhound, bytestring, deepseq, http-client, http-client-tls
      , log-base, semigroups, text, text-show, time, transformers
@@ -119980,8 +120778,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-elasticsearch";
-       version = "0.8.1";
-       sha256 = "b0a67b2335f2d1a075bf611b723572db81075c69a3f4a4a06ab35906341f8281";
+       version = "0.9.0.0";
+       sha256 = "0c25361a3f2af7ea01be3f2f2a617d691c64d334b7e2c0f91b9101ec670db900";
        libraryHaskellDepends = [
          aeson aeson-pretty base base64-bytestring bloodhound bytestring
          deepseq http-client http-client-tls log-base semigroups text
@@ -121917,8 +122715,8 @@ self: {
      }:
      mkDerivation {
        pname = "madlang";
-       version = "2.3.0.5";
-       sha256 = "debff5391424eba772cabb9717cac2a9b8cb0ca2c319c6976d75a4a274041a6b";
+       version = "2.3.0.6";
+       sha256 = "c65ec340a330ac3329173c8d07d494e000d2d1c7da6b7f485a32534bbba27790";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -122168,13 +122966,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "mainland-pretty_0_5_0_0" = callPackage
-    ({ mkDerivation, base, containers, srcloc, text }:
+  "mainland-pretty_0_6" = callPackage
+    ({ mkDerivation, base, containers, srcloc, text, transformers }:
      mkDerivation {
        pname = "mainland-pretty";
-       version = "0.5.0.0";
-       sha256 = "0666eb8e8005d42c00b49177eeb07518f578d2cb0f891aa7be6c44bd88428d43";
-       libraryHaskellDepends = [ base containers srcloc text ];
+       version = "0.6";
+       sha256 = "6f5c5e86109de07404ccfa71407f8997e4e8bfaef2c8076b62d0846bede07031";
+       libraryHaskellDepends = [
+         base containers srcloc text transformers
+       ];
        homepage = "https://github.com/mainland/mainland-pretty";
        description = "Pretty printing designed for printing source code";
        license = stdenv.lib.licenses.bsd3;
@@ -123220,6 +124020,8 @@ self: {
        pname = "marvin-interpolate";
        version = "1.1.1";
        sha256 = "40c87c6430f54d7f8f6f57f97367395f0a4e2cc44576c187dddfded280450dfb";
+       revision = "1";
+       editedCabalFile = "ae99074b6dc220badb4caebe644a6fefcf7416e5d875b70ec6edd9d52cf09f94";
        libraryHaskellDepends = [
          base haskell-src-meta mtl parsec template-haskell text
        ];
@@ -123229,6 +124031,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "marvin-interpolate_1_1_2" = callPackage
+    ({ mkDerivation, base, haskell-src-meta, hspec, mtl, parsec
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "marvin-interpolate";
+       version = "1.1.2";
+       sha256 = "d640c3bc2f70e17d1fb23c914a3d19b11f72568fda5d5c52e52c1de2e940eccf";
+       libraryHaskellDepends = [
+         base haskell-src-meta mtl parsec template-haskell text
+       ];
+       testHaskellDepends = [ base hspec text ];
+       homepage = "http://marvin.readthedocs.io/en/latest/interpolation.html";
+       description = "Compile time string interpolation a la Scala and CoffeeScript";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "marxup" = callPackage
     ({ mkDerivation, base, configurator, containers, directory, dlist
      , filepath, haskell-src-exts, labeled-tree, lens, lp-diagrams, mtl
@@ -123477,6 +124297,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "matplotlib_0_4_5" = callPackage
+    ({ mkDerivation, ad, aeson, base, bytestring, containers, filepath
+     , process, random, raw-strings-qq, split, tasty
+     , tasty-expected-failure, tasty-golden, tasty-hunit, temporary
+     }:
+     mkDerivation {
+       pname = "matplotlib";
+       version = "0.4.5";
+       sha256 = "e57fed398b57c6fd7f1071ff19f72a88af84f7b13558efcb6bdd9a7824540b39";
+       libraryHaskellDepends = [
+         aeson base bytestring containers filepath process split temporary
+       ];
+       testHaskellDepends = [
+         ad base bytestring process random raw-strings-qq split tasty
+         tasty-expected-failure tasty-golden tasty-hunit temporary
+       ];
+       homepage = "https://github.com/abarbu/matplotlib-haskell";
+       description = "Bindings to Matplotlib; a Python plotting library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "matrices" = callPackage
     ({ mkDerivation, base, criterion, deepseq, primitive, tasty
      , tasty-hunit, tasty-quickcheck, vector
@@ -123613,27 +124455,51 @@ self: {
      }) {};
 
   "maxent-learner-hw" = callPackage
-    ({ mkDerivation, array, base, containers, csv, deepseq, file-embed
-     , mtl, optparse-applicative, parallel, random, text, vector
+    ({ mkDerivation, array, base, bytestring, containers, deepseq
+     , file-embed, mtl, optparse-applicative, parallel, random
+     , random-shuffle, readcsv, text, vector
      }:
      mkDerivation {
        pname = "maxent-learner-hw";
-       version = "0.1.2";
-       sha256 = "582b87a3f644043455906a2e48cfacc83a384d08bc5c97de7b2feb971efcb434";
+       version = "0.2.0";
+       sha256 = "b31cd10081f328599bc655374067ae87d65281ec4d9093d904b9113c85e8de82";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         array base containers csv deepseq mtl random text vector
+         array base containers deepseq mtl parallel random readcsv text
+         vector
        ];
        executableHaskellDepends = [
-         array base containers deepseq file-embed mtl optparse-applicative
-         parallel random text
+         array base bytestring containers deepseq file-embed mtl
+         optparse-applicative parallel random random-shuffle text
        ];
        homepage = "https://github.com/george-steel/maxent-learner";
        description = "Hayes and Wilson's maxent learning algorithm for phonotactic grammars";
        license = "GPL";
      }) {};
 
+  "maxent-learner-hw-gui" = callPackage
+    ({ mkDerivation, array, async, base, bytestring, cairo, Chart
+     , Chart-cairo, containers, deepseq, file-embed, frpnow, frpnow-gtk3
+     , glib, gtk3, maxent-learner-hw, mtl, parallel, random
+     , raw-strings-qq, text, transformers, tuple
+     }:
+     mkDerivation {
+       pname = "maxent-learner-hw-gui";
+       version = "0.2.0";
+       sha256 = "2aaa41682eea2b0c74c3b894ed67db96a467ed1217f098daab880f69e41290ce";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         array async base bytestring cairo Chart Chart-cairo containers
+         deepseq file-embed frpnow frpnow-gtk3 glib gtk3 maxent-learner-hw
+         mtl parallel random raw-strings-qq text transformers tuple
+       ];
+       homepage = "https://github.com/george-steel/maxent-learner";
+       description = "GUI for maxent-learner-hw";
+       license = "GPL";
+     }) {};
+
   "maximal-cliques" = callPackage
     ({ mkDerivation, base, containers, vector }:
      mkDerivation {
@@ -123748,6 +124614,51 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mbox-utility_0_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, hsemail, non-empty, old-time
+     , parsec, spreadsheet, utility-ht
+     }:
+     mkDerivation {
+       pname = "mbox-utility";
+       version = "0.0.1";
+       sha256 = "e5e009f83c95b20d85c4b39d233b2f32ee15eae08d54edbaa7928848ae15e9f8";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring hsemail non-empty old-time parsec spreadsheet
+         utility-ht
+       ];
+       description = "List contents of an mbox file containing e-mails";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "mcl" = callPackage
+    ({ mkDerivation, base, binary, bytestring, Cabal, criterion
+     , deepseq, ghc-prim, gmpxx, groups, integer-gmp, mcl, openssl
+     , primitive, QuickCheck, test-framework, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "mcl";
+       version = "1.0.1";
+       sha256 = "53351bcdb0628d2a1081118f132624c9b3926b41f0de19dc1896db7607ebc957";
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         base binary bytestring deepseq ghc-prim groups integer-gmp
+         primitive
+       ];
+       librarySystemDepends = [ gmpxx mcl openssl ];
+       testHaskellDepends = [
+         base binary groups QuickCheck test-framework
+         test-framework-quickcheck2
+       ];
+       benchmarkHaskellDepends = [
+         base binary bytestring criterion deepseq groups
+       ];
+       description = "Bindings to mcl, a generic and fast pairing-based cryptography library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {inherit (pkgs) gmpxx; mcl = null; inherit (pkgs) openssl;};
+
   "mcm" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, containers
      , directory, filepath, hostname, MissingH, polyparse, process, text
@@ -124354,8 +125265,8 @@ self: {
      }:
      mkDerivation {
        pname = "mellon-core";
-       version = "0.7.0.3";
-       sha256 = "02164fc2941eed7866e81b2d06b57b1ecb18151896e0bef795ad023b21773604";
+       version = "0.7.1.0";
+       sha256 = "4331b7b931538d84ee4e0b8cc41f3a59b7b9806feccb856fac87bd4a217d425a";
        libraryHaskellDepends = [ async base mtl time transformers ];
        testHaskellDepends = [
          async base doctest hlint hspec mtl QuickCheck quickcheck-instances
@@ -124371,8 +125282,8 @@ self: {
     ({ mkDerivation, base, hlint, hpio, mellon-core }:
      mkDerivation {
        pname = "mellon-gpio";
-       version = "0.7.0.3";
-       sha256 = "da0a2a616eb2834fe98fd4e456317d569b88de27b573d11f1e82b15294ea3222";
+       version = "0.7.1.0";
+       sha256 = "2aa1e83720b3a93ab48a6654c0f455bb5a28af2211b5a5867cc2f54341ac6d94";
        libraryHaskellDepends = [ base hpio mellon-core ];
        testHaskellDepends = [ base hlint ];
        homepage = "https://github.com/dhess/mellon/";
@@ -124382,22 +125293,26 @@ self: {
      }) {};
 
   "mellon-web" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, exceptions, hlint, hpio
-     , hspec, hspec-wai, http-client, http-client-tls, http-types, lucid
-     , mellon-core, mellon-gpio, mtl, network, optparse-applicative
-     , servant, servant-client, servant-docs, servant-lucid
-     , servant-server, text, time, transformers, wai, wai-extra, warp
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, doctest
+     , exceptions, hlint, hpio, hspec, hspec-wai, http-client
+     , http-client-tls, http-types, lens, lucid, mellon-core
+     , mellon-gpio, mtl, network, optparse-applicative, QuickCheck
+     , quickcheck-instances, servant, servant-client, servant-docs
+     , servant-lucid, servant-server, servant-swagger
+     , servant-swagger-ui, swagger2, text, time, transformers, wai
+     , wai-extra, warp
      }:
      mkDerivation {
        pname = "mellon-web";
-       version = "0.7.0.3";
-       sha256 = "77396dd6091f3c940bf1b15e1415698f432bb70d53557ea2988580fc54ae256b";
+       version = "0.7.1.0";
+       sha256 = "b06a69f34bfda3c5857d13b75fcc7d901523d387e893e803c3a53a5d243f8f84";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring http-client http-types lucid mellon-core
-         servant servant-client servant-docs servant-lucid servant-server
-         text time transformers wai warp
+         aeson aeson-pretty base bytestring http-client http-types lens
+         lucid mellon-core servant servant-client servant-docs servant-lucid
+         servant-server servant-swagger servant-swagger-ui swagger2 text
+         time transformers wai warp
        ];
        executableHaskellDepends = [
          base bytestring exceptions hpio http-client http-client-tls
@@ -124405,10 +125320,11 @@ self: {
          servant-client time transformers warp
        ];
        testHaskellDepends = [
-         aeson base bytestring hlint hspec hspec-wai http-client http-types
-         lucid mellon-core network servant servant-client servant-docs
-         servant-lucid servant-server text time transformers wai wai-extra
-         warp
+         aeson aeson-pretty base bytestring doctest hlint hspec hspec-wai
+         http-client http-types lens lucid mellon-core network QuickCheck
+         quickcheck-instances servant servant-client servant-docs
+         servant-lucid servant-server servant-swagger servant-swagger-ui
+         swagger2 text time transformers wai wai-extra warp
        ];
        homepage = "https://github.com/dhess/mellon/";
        description = "A REST web service for Mellon controllers";
@@ -125658,8 +126574,8 @@ self: {
        pname = "mime-mail";
        version = "0.4.13.1";
        sha256 = "9481671092739dab1d963c9db0dce56a0187390fb24c9badeeded6afb5895917";
-       revision = "1";
-       editedCabalFile = "026fec31ffe007b7dd525f9a7d7a91412978120042e5d156514bf01c96be335a";
+       revision = "2";
+       editedCabalFile = "3d56025f95b673cde3925c40f25fde19031ea445f434fba6555cdb0284a7dc9c";
        libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring filepath process
          random text
@@ -125841,8 +126757,8 @@ self: {
      }:
      mkDerivation {
        pname = "minimorph";
-       version = "0.1.6.0";
-       sha256 = "7faeea373e316aefc8bb8fcf7e3265263be94d8f985a7bb07ef67c7fe502ba9d";
+       version = "0.1.6.1";
+       sha256 = "94677b454b86a47d1b04ef1462873708976546bbb7a3bcc4f3ffe222d98bb844";
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit text
@@ -126024,8 +126940,8 @@ self: {
      }:
      mkDerivation {
        pname = "miniutter";
-       version = "0.4.4.2";
-       sha256 = "3a08fc860e92aa22e83b07a0aa136530f60e675d24ef8e75009c676c2a4320db";
+       version = "0.4.6.0";
+       sha256 = "bde66af62bb1f9d4649bc9ddaf6b82f70ba5078591d6cd7462effb650c876a24";
        libraryHaskellDepends = [
          base binary containers ghc-prim minimorph text
        ];
@@ -126872,6 +127788,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monad-control-aligned" = callPackage
+    ({ mkDerivation, base, stm, transformers, transformers-base
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "monad-control-aligned";
+       version = "0.0.1";
+       sha256 = "ddb75107f0896931a83066d2ad85745c0bf4e0396046a3d5c17f35809a114287";
+       libraryHaskellDepends = [
+         base stm transformers transformers-base transformers-compat
+       ];
+       homepage = "https://github.com/athanclark/monad-control#readme";
+       description = "Just like monad-control, except less efficient, and the monadic state terms are all * -> *";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "monad-coroutine" = callPackage
     ({ mkDerivation, base, monad-parallel, transformers
      , transformers-compat
@@ -127104,6 +128036,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "monad-logger_0_3_24" = 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.24";
+       sha256 = "05e579193068769d641cbf6bf6475682497897e64640b3936f6eda66cb36e8e4";
+       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
      }:
@@ -131192,6 +132147,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "naqsha" = callPackage
+    ({ mkDerivation, base, data-default, groups, hspec, HUnit
+     , QuickCheck, vector
+     }:
+     mkDerivation {
+       pname = "naqsha";
+       version = "0.1.0.0";
+       sha256 = "ae6ed25bf7a8d19defdd9f15c0e4d2ff16665518e7d2bd7620b2f367efdac886";
+       libraryHaskellDepends = [ base data-default groups vector ];
+       testHaskellDepends = [ base groups hspec HUnit QuickCheck ];
+       homepage = "http://github.com/naqsha/naqsha.git";
+       description = "A library for working with geospatial data types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "narc" = callPackage
     ({ mkDerivation, base, HDBC, HUnit, mtl, QuickCheck, random }:
      mkDerivation {
@@ -131217,13 +132187,13 @@ self: {
      }) {};
 
   "nat-sized-numbers" = callPackage
-    ({ mkDerivation, base, doctest, QuickCheck, smallcheck }:
+    ({ mkDerivation, base, deepseq, doctest, hedgehog, QuickCheck }:
      mkDerivation {
        pname = "nat-sized-numbers";
-       version = "0.2.0.0";
-       sha256 = "b3c907665ff1107da9c0acb9404766f6ded98e3cfd51c2348ff7434eaa32e23c";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base doctest QuickCheck smallcheck ];
+       version = "0.3.0.0";
+       sha256 = "b4e6e798f2fa61d4a7836f6d2f7056de1336af2aff72daac21782fed207a6fc2";
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [ base doctest hedgehog QuickCheck ];
        homepage = "https://github.com/oisdk/nat-sized-numbers#readme";
        description = "Variable-sized numbers from type-level nats";
        license = stdenv.lib.licenses.mit;
@@ -134288,8 +135258,8 @@ self: {
      }:
      mkDerivation {
        pname = "notzero";
-       version = "0.0.10";
-       sha256 = "17fdfc0152869243d6523f003316427be9c8e64fc4a6294e506d54e3ca22943c";
+       version = "0.0.11";
+       sha256 = "e7f8f6b4583914c0d0e95951290f7805f60fa7c85ea5bee03bd0db1fa673186b";
        libraryHaskellDepends = [
          base bifunctors lens mtl semigroupoids semigroups transformers
        ];
@@ -135574,6 +136544,8 @@ self: {
        pname = "ombra";
        version = "0.3.0.0";
        sha256 = "99516f07fdc85967a562668f136a2899fda28ea6fe3be27e09bc06a2aca654ad";
+       revision = "1";
+       editedCabalFile = "4587fcff5f34debd811b2a45df47a1dd6fda7410c153aeb4ac074574df353703";
        libraryHaskellDepends = [
          base Boolean gl hashable hashtables transformers
          unordered-containers vector-space
@@ -135736,6 +136708,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "one-liner_0_9" = callPackage
+    ({ mkDerivation, base, bifunctors, contravariant, ghc-prim, HUnit
+     , profunctors, tagged, transformers
+     }:
+     mkDerivation {
+       pname = "one-liner";
+       version = "0.9";
+       sha256 = "06739f18d5adebcf88843ebdeda91eba8c8f5146563097f5a5a3a2cf892c49b7";
+       libraryHaskellDepends = [
+         base bifunctors contravariant ghc-prim profunctors tagged
+         transformers
+       ];
+       testHaskellDepends = [ base contravariant HUnit ];
+       homepage = "https://github.com/sjoerdvisscher/one-liner";
+       description = "Constraint-based generics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "one-time-password" = callPackage
     ({ mkDerivation, base, bytestring, cereal, cryptonite, memory
      , tasty, tasty-hunit, time
@@ -136396,6 +137387,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "openssl-streams_1_2_1_1" = callPackage
+    ({ mkDerivation, base, bytestring, HsOpenSSL, HUnit, io-streams
+     , network, test-framework, test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "openssl-streams";
+       version = "1.2.1.1";
+       sha256 = "df4fc4d6700d4c63f8829ceab8226a9894a8e04d83932e0c8540ce6a0173d6aa";
+       libraryHaskellDepends = [
+         base bytestring HsOpenSSL io-streams network
+       ];
+       testHaskellDepends = [
+         base bytestring HsOpenSSL HUnit io-streams network test-framework
+         test-framework-hunit
+       ];
+       description = "OpenSSL network support for io-streams";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "opentheory" = callPackage
     ({ mkDerivation, base, opentheory-primitive, QuickCheck }:
      mkDerivation {
@@ -137750,19 +138761,17 @@ self: {
 
   "packunused" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath, haskell-src-exts
-     , optparse-applicative, split
+     , optparse-applicative, process, split
      }:
      mkDerivation {
        pname = "packunused";
-       version = "0.1.1.4";
-       sha256 = "c86ff007f3f1504c20f0fc86c8d277a1e424a16768debb19ffce767f30470baa";
-       revision = "1";
-       editedCabalFile = "5ddb122ff2a1ac4e79226f31b4d8f7dab67bb5501d0e715d84dbfe36c845b772";
+       version = "0.1.2";
+       sha256 = "d3d9ff568bf6e50185bb716cca8a06eae79ecc6bbd2a964982992ca96bbb5446";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base Cabal directory filepath haskell-src-exts optparse-applicative
-         split
+         process split
        ];
        homepage = "https://github.com/hvr/packunused";
        description = "Tool for detecting redundant Cabal package dependencies";
@@ -138105,8 +139114,8 @@ self: {
     ({ mkDerivation, base, csv, pandoc, pandoc-types, text }:
      mkDerivation {
        pname = "pandoc-csv2table";
-       version = "1.0.4";
-       sha256 = "c1f14975239d5b26faba78f3db6c84573d4db99ab021560c184755259ca61b82";
+       version = "1.0.5";
+       sha256 = "814e8fa7cf083995aedce38c04cbeabac479adea3eadd011f897dc4b0313c988";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base csv pandoc pandoc-types text ];
@@ -139552,6 +140561,8 @@ self: {
        pname = "partial-isomorphisms";
        version = "0.2.2";
        sha256 = "f6ee216db7be14d497c428562c83423a5d2579c86b70b822996bde28c196569c";
+       revision = "1";
+       editedCabalFile = "dc27254b2fb36077e39a78632a392c4dc5beca2b9dcc536fea0ee2532a453263";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://www.informatik.uni-marburg.de/~rendel/unparse";
        description = "Partial isomorphisms";
@@ -139821,6 +140832,8 @@ self: {
        pname = "path-io";
        version = "1.2.2";
        sha256 = "72255f9d014285c87dd4c537f445a5448b2b64e81c4ee4759464b4b0e401fe46";
+       revision = "1";
+       editedCabalFile = "d570fb571051195c6783f148431f7bfddb496c4bf71968f9a0580ccd2f65e3e4";
        libraryHaskellDepends = [
          base containers directory exceptions filepath path temporary time
          transformers unix-compat
@@ -141308,8 +142321,8 @@ self: {
     ({ mkDerivation, base, time, yesod }:
      mkDerivation {
        pname = "persistent-ratelimit";
-       version = "0.2.0.0";
-       sha256 = "e3b14ed8c78999ebe797e84cac75bc66ed7bd264b9ccef92279193be31ed114e";
+       version = "0.3.0.0";
+       sha256 = "5544ff263f7d6398bbf2c05d175a2464fc1661a3f4430c0a8b52528138e50716";
        libraryHaskellDepends = [ base time yesod ];
        homepage = "https://github.com/jprider63/persistent-ratelimit";
        description = "A library for rate limiting activities with a persistent backend";
@@ -141874,8 +142887,8 @@ self: {
      }:
      mkDerivation {
        pname = "phoityne-vscode";
-       version = "0.0.13.0";
-       sha256 = "72d782287fccefaab02a524a8fc64affbee3692b56889dd07ed64427a1c453f7";
+       version = "0.0.14.0";
+       sha256 = "e5b902f9317ac8477ee942bbc77204c02b8c0b6b4698a53618424d1f12045fb3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -145444,8 +146457,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-query";
-       version = "3.1.0";
-       sha256 = "32fbc4c4dc73c6338bfb58c61a2f823b6b6b0113b87735748a53a3e38ca7ba87";
+       version = "3.2.0";
+       sha256 = "7f5f41e889414dc6e4f5f403ab86381ff6c345c9bc01686901365ab2423cea09";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder bytestring containers
          data-default either exceptions file-embed haskell-src-meta hreader
@@ -145519,8 +146532,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-simple-bind";
-       version = "0.4.0";
-       sha256 = "a313032f8a8a0c6b97094d396afcd81a04a2d017699a08b5e2cbc2b8309cf284";
+       version = "0.4.1";
+       sha256 = "8a076f24bc73989df7b0388457d2195c6456cf7ed1a38c3ce774c746208afce9";
        libraryHaskellDepends = [
          attoparsec base bytestring data-default exceptions heredoc
          postgresql-simple template-haskell text time
@@ -145744,32 +146757,33 @@ self: {
        homepage = "https://github.com/begriffs/postgrest";
        description = "REST API for any Postgres database";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgrest-ws" = callPackage
-    ({ mkDerivation, aeson, auto-update, base, base64-bytestring
-     , bytestring, containers, either, hasql, hasql-pool, hspec
-     , hspec-wai, hspec-wai-json, http-types, jwt, postgresql-libpq
-     , postgrest, protolude, stm, stm-containers, text, time
-     , transformers, unix, unordered-containers, wai, wai-extra
-     , wai-websockets, warp, websockets
+    ({ mkDerivation, aeson, ansi-wl-pprint, auto-update, base
+     , base64-bytestring, bytestring, configurator, containers, either
+     , hasql, hasql-pool, heredoc, hspec, hspec-wai, hspec-wai-json
+     , http-types, jwt, lens, lens-aeson, optparse-applicative
+     , postgresql-libpq, protolude, stm, stm-containers, text, time
+     , transformers, unix, unordered-containers, wai, wai-app-static
+     , wai-extra, wai-websockets, warp, websockets
      }:
      mkDerivation {
        pname = "postgrest-ws";
-       version = "0.1.0.2";
-       sha256 = "52d6e25d7f3823c5395ad8d8b1cc3538e9a410defd0238852e5e8f7d87cfa09c";
+       version = "0.2.0.0";
+       sha256 = "a774a73c7c0bb3ef10e5b96c66749323a9b9244d1e46bcdc3cbd513b9887d42a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring either hasql hasql-pool http-types jwt
-         postgresql-libpq postgrest protolude stm stm-containers text time
+         aeson base bytestring either hasql hasql-pool http-types jwt lens
+         lens-aeson postgresql-libpq protolude stm stm-containers text time
          unordered-containers wai wai-websockets websockets
        ];
        executableHaskellDepends = [
-         auto-update base base64-bytestring hasql hasql-pool jwt
-         postgresql-libpq postgrest protolude text time transformers unix
-         warp
+         ansi-wl-pprint auto-update base base64-bytestring bytestring
+         configurator hasql hasql-pool heredoc http-types jwt
+         optparse-applicative postgresql-libpq protolude text time
+         transformers unix wai wai-app-static wai-extra warp
        ];
        testHaskellDepends = [
          aeson base containers hasql hasql-pool hspec hspec-wai
@@ -145778,7 +146792,6 @@ self: {
        homepage = "https://github.com/diogob/postgrest-ws#readme";
        description = "PostgREST extension to map LISTEN/NOTIFY messages to Websockets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postie" = callPackage
@@ -146132,8 +147145,8 @@ self: {
      }:
      mkDerivation {
        pname = "preamble";
-       version = "0.0.33";
-       sha256 = "385f6224ca22a59034f1b79c8f99d779234f0a04cd5293565e0ed22321e7b24b";
+       version = "0.0.35";
+       sha256 = "2a1419c657ae92b9ed2120dbdbde519ef5ef944c6a1cc6a805b152e9b1731e9f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -148568,14 +149581,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "publicsuffix_0_20170416" = callPackage
+  "publicsuffix_0_20170508" = callPackage
     ({ mkDerivation, base, criterion, filepath, hspec, random
      , template-haskell
      }:
      mkDerivation {
        pname = "publicsuffix";
-       version = "0.20170416";
-       sha256 = "f05995b722e195dd33d996074cc05f51dd07165e8519c4e27215a59598411712";
+       version = "0.20170508";
+       sha256 = "646fa2a0e148e733bfe8285517155962f59dc2ce463c216ca6a042feebf46959";
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion random ];
@@ -152076,15 +153089,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rattletrap_2_2_3" = callPackage
+  "rattletrap_2_2_4" = callPackage
     ({ mkDerivation, aeson, aeson-casing, base, bimap, binary
      , binary-bits, bytestring, containers, data-binary-ieee754
      , filepath, hspec, template-haskell, temporary, text, vector
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "2.2.3";
-       sha256 = "32ec0c427fd93eadcec1e6f0abcb6fe6ef7c1c59dbd15de591cf0c03a1d2be06";
+       version = "2.2.4";
+       sha256 = "31fccbfed275110c6cd6e1800e04c1c84364608aa7ab7f662925103ddd28a3a7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -152191,12 +153204,12 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
-  "rawfilepath_0_2_2" = callPackage
+  "rawfilepath_0_2_4" = callPackage
     ({ mkDerivation, base, bytestring, unix }:
      mkDerivation {
        pname = "rawfilepath";
-       version = "0.2.2";
-       sha256 = "b514ffc9b9b508cc82cd6ed2dce631acc0636ceb0b3be777d853feaa43df0420";
+       version = "0.2.4";
+       sha256 = "cbb01b49f7ff0271a8c6e4124f93515e6cdabf9581278594e19dd916b6bd5bd3";
        libraryHaskellDepends = [ base bytestring unix ];
        testHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/xtendo-org/rawfilepath#readme";
@@ -155067,7 +156080,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "relational-query_0_9_0_1" = callPackage
+  "relational-query_0_9_1_0" = 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
@@ -155075,8 +156088,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.9.0.1";
-       sha256 = "2dedf32ee73538fc3608bbbc062dd3f2daf6572d4282972cd872c57a772257c3";
+       version = "0.9.1.0";
+       sha256 = "cc0c805a16d342d1d0511033571487a1872f541990f2083d577ddc6f059d62db";
        libraryHaskellDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text th-reify-compat time
@@ -155149,6 +156162,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relational-record_0_1_8_0" = callPackage
+    ({ mkDerivation, base, persistable-record
+     , persistable-types-HDBC-pg, relational-query
+     , relational-query-HDBC
+     }:
+     mkDerivation {
+       pname = "relational-record";
+       version = "0.1.8.0";
+       sha256 = "0e98593a72d3acaa4c50433b1209c6fb975aebcbea56b5659ea225caf6a7ff7b";
+       libraryHaskellDepends = [
+         base persistable-record 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
@@ -155156,8 +156188,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-record-examples";
-       version = "0.3.1.4";
-       sha256 = "e0bced76ceb888bd7c2e38afc0df18468f272af8ee68de15dddbcc9ea7809f67";
+       version = "0.3.2.1";
+       sha256 = "1b226c5e00d162161afe18406df33c7aae392cac9ed2a02e1707e7a7c5eb0bf8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -155178,6 +156210,8 @@ self: {
        pname = "relational-schemas";
        version = "0.1.3.1";
        sha256 = "d13137773f21b73add30ef9659dc5abc0f5b51ab33c2061c9e9983e4d47151bd";
+       revision = "2";
+       editedCabalFile = "0f69bbc05aaa50ef00ca00de4a4cf8274e60dd71d48e4df337dcb456bda5a354";
        libraryHaskellDepends = [
          base bytestring containers persistable-record relational-query
          template-haskell time
@@ -156018,8 +157052,8 @@ self: {
        pname = "req";
        version = "0.2.0";
        sha256 = "e64e56622f1ec06df83e2c8516effa49058b4d7196c28127ab98190cc320ebbc";
-       revision = "2";
-       editedCabalFile = "5895d467759fc89c2007336012c7ab38b6af831e925fce72fb98cd04be602417";
+       revision = "3";
+       editedCabalFile = "b77f15fa1001785ea46659f8ae987ea9cd4ef394fb9abf212300d77284ba1ad3";
        libraryHaskellDepends = [
          aeson authenticate-oauth base blaze-builder bytestring
          case-insensitive connection data-default-class http-api-data
@@ -156668,6 +157702,31 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "rethinkdb_2_2_0_10" = callPackage
+    ({ mkDerivation, aeson, async, base, base64-bytestring, binary
+     , bytestring, containers, criterion, data-default, doctest, mtl
+     , network, scientific, text, time, unordered-containers
+     , utf8-string, vector
+     }:
+     mkDerivation {
+       pname = "rethinkdb";
+       version = "2.2.0.10";
+       sha256 = "bbb3fcdec56e3e7916acf97267cccd6022e16bbda0cdb4fa626bc1c216137852";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base64-bytestring binary bytestring containers
+         data-default mtl network scientific text time unordered-containers
+         utf8-string vector
+       ];
+       testHaskellDepends = [ base doctest ];
+       benchmarkHaskellDepends = [ aeson async base criterion text ];
+       homepage = "http://github.com/atnnn/haskell-rethinkdb";
+       description = "A driver for RethinkDB 2.2";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rethinkdb-client-driver" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
      , criterion, hashable, hspec, hspec-smallcheck, mtl, network
@@ -159010,6 +160069,30 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "safecopy_0_9_3_2" = callPackage
+    ({ mkDerivation, array, base, bytestring, cereal, containers, lens
+     , lens-action, old-time, QuickCheck, quickcheck-instances, tasty
+     , tasty-quickcheck, template-haskell, text, time, vector
+     }:
+     mkDerivation {
+       pname = "safecopy";
+       version = "0.9.3.2";
+       sha256 = "05f5508d8e6db1f71056096373e5123586fdd704f3765cc9857f1bffb2e46b37";
+       libraryHaskellDepends = [
+         array base bytestring cereal containers old-time template-haskell
+         text time vector
+       ];
+       testHaskellDepends = [
+         array base cereal containers lens lens-action QuickCheck
+         quickcheck-instances tasty tasty-quickcheck template-haskell time
+         vector
+       ];
+       homepage = "https://github.com/acid-state/safecopy";
+       description = "Binary serialization with version control";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "safecopy-store" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, lens
      , lens-action, old-time, QuickCheck, quickcheck-instances, store
@@ -159018,10 +160101,8 @@ self: {
      }:
      mkDerivation {
        pname = "safecopy-store";
-       version = "0.9.3";
-       sha256 = "007a353d3f8b89affa30eb9479ab0578cf24a4a6c051828cfcc1f1859e7ff519";
-       revision = "1";
-       editedCabalFile = "7978a2a315feb629e1044e6996a765bc046e34e42baf11b5038e79a8952c8066";
+       version = "0.9.4";
+       sha256 = "a4350a8d61d85e9f7f84c4cce63e1ec5e70e5c43c45029ce3ee8af08e4c810c4";
        libraryHaskellDepends = [
          array base bytestring containers old-time store store-core
          template-haskell text time vector
@@ -159772,15 +160853,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "sbv_5_15" = callPackage
+  "sbv_6_0" = callPackage
     ({ mkDerivation, array, async, base, base-compat, containers
      , crackNum, data-binary-ieee754, deepseq, directory, filepath, ghc
      , HUnit, mtl, old-time, pretty, process, QuickCheck, random, syb
      }:
      mkDerivation {
        pname = "sbv";
-       version = "5.15";
-       sha256 = "2364c29cb4cd20c8489e76689aa885072bf51faf2f60b208ec58be3d5ae5d719";
+       version = "6.0";
+       sha256 = "88dc1abfbe118150a4ca114820fcaf278deb75ec2e38787a841ee24285601966";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -161328,23 +162409,24 @@ self: {
      }) {};
 
   "secp256k1" = callPackage
-    ({ mkDerivation, base, base16-bytestring, binary, bytestring
-     , cereal, cryptohash, entropy, HUnit, largeword, mtl, QuickCheck
+    ({ mkDerivation, base, base16-bytestring, binary, bytestring, Cabal
+     , cryptohash, entropy, HUnit, largeword, mtl, QuickCheck
      , string-conversions, test-framework, test-framework-hunit
      , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "secp256k1";
-       version = "0.4.6";
-       sha256 = "50568cc5ebf50125b222c208c0e0dc580dd9b69266c39ec9e458600f5bff40c1";
+       version = "0.4.8";
+       sha256 = "13fb455af6874fb9a52adb85a52bfcfbcab5e80eb18b410fa088a92cabd3db4a";
+       setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
-         base base16-bytestring binary bytestring cereal entropy largeword
-         mtl QuickCheck string-conversions
+         base base16-bytestring binary bytestring entropy largeword mtl
+         QuickCheck string-conversions
        ];
        testHaskellDepends = [
-         base base16-bytestring bytestring cryptohash entropy HUnit mtl
-         QuickCheck string-conversions test-framework test-framework-hunit
-         test-framework-quickcheck2
+         base base16-bytestring binary bytestring cryptohash entropy HUnit
+         mtl QuickCheck string-conversions test-framework
+         test-framework-hunit test-framework-quickcheck2
        ];
        homepage = "http://github.com/haskoin/secp256k1-haskell#readme";
        description = "Bindings for secp256k1 library from Bitcoin Core";
@@ -161474,8 +162556,10 @@ self: {
      }:
      mkDerivation {
        pname = "selda";
-       version = "0.1.3.2";
-       sha256 = "ee9e3b1f3ca5610220a3a3a68748ebd5880e56d2920988afa12b9e1c1b0046c5";
+       version = "0.1.6.0";
+       sha256 = "f9c615d3f37deb2eb2169d9a901198cb1216ceef576128f9f9b0e0363dd434bd";
+       revision = "1";
+       editedCabalFile = "2adda3c7bbe009fad6df92f2dee2384356e24d2ed0f05ef8c37608635167ab4d";
        libraryHaskellDepends = [
          base exceptions hashable mtl psqueues text time
          unordered-containers
@@ -161491,8 +162575,8 @@ self: {
      }:
      mkDerivation {
        pname = "selda-postgresql";
-       version = "0.1.2.0";
-       sha256 = "d2cc25ee4dc34a0ce421997b6367304ebc300bc5d1fd94e82232178b3da1199b";
+       version = "0.1.3.0";
+       sha256 = "da98e4a38498bb5e24c4c67377466ef0b1ed412d7e0e2e41c7451326461e9e1e";
        libraryHaskellDepends = [
          base bytestring exceptions postgresql-libpq selda text
        ];
@@ -161502,13 +162586,15 @@ self: {
      }) {};
 
   "selda-sqlite" = callPackage
-    ({ mkDerivation, base, direct-sqlite, exceptions, selda, text }:
+    ({ mkDerivation, base, direct-sqlite, directory, exceptions, selda
+     , text
+     }:
      mkDerivation {
        pname = "selda-sqlite";
-       version = "0.1.2.0";
-       sha256 = "64b04c3b8da3bbe1dec9a28b9aa11451d5e7d5cbfa2b58cc9fa71cf40d4f3e92";
+       version = "0.1.3.0";
+       sha256 = "213429400ee7381536c5ff72adf19149bca1ce71d39a46f376a965b3515b6156";
        libraryHaskellDepends = [
-         base direct-sqlite exceptions selda text
+         base direct-sqlite directory exceptions selda text
        ];
        homepage = "https://github.com/valderman/selda";
        description = "SQLite backend for the Selda database EDSL";
@@ -162714,8 +163800,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token";
-       version = "0.4.4.0";
-       sha256 = "60cc885befaf7a53d2252617e982d8f6a89c43051438a6b1cf3c102786c03a38";
+       version = "0.4.5.0";
+       sha256 = "a714aeac91c01cf31c309d7e9d769153a7aeab82168dcda68accc6772c77e461";
        libraryHaskellDepends = [
          aeson-injector base bytestring containers mtl pwstore-fast
          servant-auth-token-api servant-server text time transformers uuid
@@ -162793,19 +163879,19 @@ self: {
 
   "servant-auth-token-persistent" = callPackage
     ({ mkDerivation, aeson-injector, base, bytestring, containers
-     , ghc-prim, monad-control, mtl, persistent, persistent-postgresql
-     , persistent-template, servant-auth-token, servant-auth-token-api
-     , servant-server, text, time, transformers, transformers-base, uuid
+     , ghc-prim, monad-control, mtl, persistent, persistent-template
+     , servant-auth-token, servant-auth-token-api, servant-server, text
+     , time, transformers, transformers-base, uuid
      }:
      mkDerivation {
        pname = "servant-auth-token-persistent";
-       version = "0.4.0.0";
-       sha256 = "8b2a6cbc45e3f52ac5d12cd05c052373ca758599672b6086b3148e0dd5f9a075";
+       version = "0.5.0.0";
+       sha256 = "20d2347537829258f34f543df5ecbb60b49362c0d97b0f240a1f9a563624d4e5";
        libraryHaskellDepends = [
          aeson-injector base bytestring containers ghc-prim monad-control
-         mtl persistent persistent-postgresql persistent-template
-         servant-auth-token servant-auth-token-api servant-server text time
-         transformers transformers-base uuid
+         mtl persistent persistent-template servant-auth-token
+         servant-auth-token-api servant-server text time transformers
+         transformers-base uuid
        ];
        homepage = "https://github.com/ncrashed/servant-auth-token#readme";
        description = "Persistent backend for servant-auth-token server";
@@ -162843,20 +163929,24 @@ self: {
 
   "servant-checked-exceptions" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, doctest, Glob
-     , http-media, lens, servant, servant-client, servant-docs
-     , servant-server, text
+     , hspec-wai, http-media, lens, servant, servant-client
+     , servant-docs, servant-server, tasty, tasty-hspec, tasty-hunit
+     , text, wai
      }:
      mkDerivation {
        pname = "servant-checked-exceptions";
-       version = "0.2.0.0";
-       sha256 = "44a71d7cb28212b4ee9ce5b1f11d63db6fb53e6311eaeb7e820184d660ad88af";
+       version = "0.3.0.2";
+       sha256 = "d733366c36b9e9693b1dd5378f13b89bf9145d6f771d6a5deec01ca06a8fe96d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring deepseq http-media lens servant
          servant-client servant-docs servant-server text
        ];
-       testHaskellDepends = [ base doctest Glob ];
+       testHaskellDepends = [
+         base bytestring doctest Glob hspec-wai servant servant-server tasty
+         tasty-hspec tasty-hunit wai
+       ];
        homepage = "https://github.com/cdepillabout/servant-checked-exceptions";
        description = "Checked exceptions for Servant APIs";
        license = stdenv.lib.licenses.bsd3;
@@ -163509,7 +164599,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "servant-purescript_0_7_0_0" = callPackage
+  "servant-purescript_0_8_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, http-types, lens, mainland-pretty, purescript-bridge
      , servant, servant-foreign, servant-server, servant-subscriber
@@ -163517,8 +164607,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-purescript";
-       version = "0.7.0.0";
-       sha256 = "672cf63144b54f3f3de3662794a06270d806d5a7575d52156f3b487eb637d6f8";
+       version = "0.8.0.0";
+       sha256 = "9783f725d668009322e8d179114b6dd7773bb68ae7810b09a30ad3124b104a40";
        libraryHaskellDepends = [
          aeson base bytestring containers directory filepath http-types lens
          mainland-pretty purescript-bridge servant servant-foreign
@@ -164920,8 +166010,8 @@ self: {
     ({ mkDerivation, base, basic-prelude, directory, shake }:
      mkDerivation {
        pname = "shakers";
-       version = "0.0.17";
-       sha256 = "b8705c18de95396e5b816f9f72967fbbc181579f382021cda6e2f7bd7b1cb5e3";
+       version = "0.0.18";
+       sha256 = "fb35d95017789d492b63e4a71e6ad7ce50d32968d1e17ddb34ef164749d787ce";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base basic-prelude directory shake ];
@@ -165324,8 +166414,8 @@ self: {
      }:
      mkDerivation {
        pname = "shellmate";
-       version = "0.3.4.1";
-       sha256 = "a66fb8d53eac5736dd7d69c7835af60ca2afff389c65e0972ab199b0983a6430";
+       version = "0.3.4.2";
+       sha256 = "05e9de1c5111fc51a7fe01c49e1a819c16f5cce6cff9526b82ca1e296bd96d88";
        libraryHaskellDepends = [
          base bytestring directory filepath process temporary transformers
          unix
@@ -165344,6 +166434,8 @@ self: {
        pname = "shellmate-extras";
        version = "0.3.4.1";
        sha256 = "f3dd62394e99af6cf92cb50c8ce1f3cd819448eda3009e8c11bb312e26f9b82e";
+       revision = "1";
+       editedCabalFile = "c68752dbdcaf7a0dd35cb579dce1f86b9caf89cf1f311d6b390351bc1555a887";
        libraryHaskellDepends = [
          base bytestring feed http-conduit http-types mime-types shellmate
          tagsoup text utf8-string xml
@@ -165443,6 +166535,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "shift" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, bytestring
+     , composition, data-default, lens, optparse-applicative
+     , system-fileio, system-filepath, text, turtle
+     }:
+     mkDerivation {
+       pname = "shift";
+       version = "0.1.0.0";
+       sha256 = "edfae8568d881734c3d1f6321912abe3854168a16f25168d8d91ecce8859ab82";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal base bytestring composition data-default lens
+         optparse-applicative system-fileio system-filepath text turtle
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/vmchale/teleport#readme";
+       description = "A tool to quickly switch between directories";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "shikensu" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, filepath, flow
      , Glob, tasty, tasty-hunit, text, unordered-containers
@@ -168182,8 +169295,8 @@ self: {
        pname = "snap";
        version = "1.0.0.1";
        sha256 = "293f16c1404793121d3d85abb6287bbb32f5dc1d82b12146d4bb650052322db8";
-       revision = "3";
-       editedCabalFile = "97c68769fdd4f5693b365da446e17a0181e2fcc2e41dbc56f37804a3204646ef";
+       revision = "4";
+       editedCabalFile = "131aa86ec1be2b9a61f98d9df5d102c78f505a09c1d843c1d57a626e1ee18ead";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring cereal clientsession configurator
          containers directory directory-tree dlist filepath hashable heist
@@ -168309,6 +169422,8 @@ self: {
        pname = "snap-core";
        version = "1.0.2.0";
        sha256 = "e48eba4727169b9c599c6de1791deb881eeee12e25658a30590116b450e5b65c";
+       revision = "1";
+       editedCabalFile = "fd40a0961a8517e3566670b095595ac2ac20ee4ea2615b32479046ac498a6b05";
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder case-insensitive
          containers directory filepath hashable HUnit io-streams lifted-base
@@ -168330,6 +169445,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "snap-core_1_0_2_1" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder
+     , case-insensitive, containers, deepseq, directory, filepath
+     , hashable, HUnit, io-streams, lifted-base, monad-control, mtl
+     , network, network-uri, old-locale, parallel, QuickCheck, random
+     , readable, regex-posix, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, transformers
+     , transformers-base, unix-compat, unordered-containers, vector
+     , zlib
+     }:
+     mkDerivation {
+       pname = "snap-core";
+       version = "1.0.2.1";
+       sha256 = "de903d5dc4640f49cfebb41b4442f4901057a8627694373639d3972ccdcca11d";
+       libraryHaskellDepends = [
+         attoparsec base bytestring bytestring-builder case-insensitive
+         containers directory filepath hashable HUnit io-streams lifted-base
+         monad-control mtl network network-uri old-locale random readable
+         regex-posix text time transformers transformers-base unix-compat
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring bytestring-builder case-insensitive
+         containers deepseq directory filepath hashable HUnit io-streams
+         lifted-base monad-control mtl network network-uri old-locale
+         parallel QuickCheck random readable regex-posix test-framework
+         test-framework-hunit test-framework-quickcheck2 text time
+         transformers transformers-base unix-compat unordered-containers
+         vector zlib
+       ];
+       homepage = "http://snapframework.com/";
+       description = "Snap: A Haskell Web Framework (core interfaces and types)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "snap-cors" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, case-insensitive
      , hashable, network, network-uri, snap, text, unordered-containers
@@ -168517,6 +169668,50 @@ self: {
        pname = "snap-server";
        version = "1.0.2.0";
        sha256 = "677f29595331aeee82b5bbbe3fdbe228093c387c6527d4b70c5492de0c5bd549";
+       revision = "1";
+       editedCabalFile = "bc24161a1b1eec7d7568f34dcc4b3d44a9b6df793c5e63aa5f03ca8681984553";
+       configureFlags = [ "-fopenssl" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder bytestring bytestring-builder
+         case-insensitive clock containers filepath HsOpenSSL io-streams
+         io-streams-haproxy lifted-base mtl network old-locale
+         openssl-streams snap-core text time unix unix-compat vector
+       ];
+       testHaskellDepends = [
+         attoparsec base base16-bytestring blaze-builder bytestring
+         bytestring-builder case-insensitive clock containers deepseq
+         directory filepath HsOpenSSL http-common http-streams HUnit
+         io-streams io-streams-haproxy lifted-base monad-control mtl network
+         old-locale openssl-streams parallel QuickCheck random snap-core
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+         threads time transformers unix unix-compat vector
+       ];
+       benchmarkHaskellDepends = [
+         attoparsec base blaze-builder bytestring bytestring-builder
+         criterion io-streams io-streams-haproxy snap-core vector
+       ];
+       homepage = "http://snapframework.com/";
+       description = "A web server for the Snap Framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "snap-server_1_0_2_1" = callPackage
+    ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
+     , bytestring, bytestring-builder, case-insensitive, clock
+     , containers, criterion, deepseq, directory, filepath, HsOpenSSL
+     , http-common, http-streams, HUnit, io-streams, io-streams-haproxy
+     , lifted-base, monad-control, mtl, network, old-locale
+     , openssl-streams, parallel, QuickCheck, random, snap-core
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, threads, time, transformers, unix, unix-compat, vector
+     }:
+     mkDerivation {
+       pname = "snap-server";
+       version = "1.0.2.1";
+       sha256 = "4ededc6cf9ee007fb3a7489384e222ae8cfb58970697e3e4de40c70763dc4899";
        configureFlags = [ "-fopenssl" ];
        isLibrary = true;
        isExecutable = true;
@@ -170128,6 +171323,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "sort" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "sort";
+       version = "0.0.0.1";
+       sha256 = "ce4221e43b8b02615a0d0c50b7b9b40057505d0c7148fe00eed2be74bec4a242";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/cdornan/sort";
+       description = "A Haskell sorting toolkit";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sort-by-pinyin" = callPackage
     ({ mkDerivation, air, air-extra, air-th, base, bytestring
      , containers, text
@@ -171505,6 +172712,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "sqlcipher" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath, hspec
+     , openssl, pretty, temporary, time, utf8-string
+     }:
+     mkDerivation {
+       pname = "sqlcipher";
+       version = "1.0.1.0";
+       sha256 = "820806a880763a41dc6b97ac7fc4b5330b124e21fe91109d97567ca78bcc5d60";
+       libraryHaskellDepends = [
+         base bytestring directory pretty time utf8-string
+       ];
+       librarySystemDepends = [ openssl ];
+       testHaskellDepends = [ base filepath hspec temporary ];
+       homepage = "http://github.com/figome/haskell-sqlcipher";
+       description = "Haskell binding to sqlcipher";
+       license = stdenv.lib.licenses.bsd3;
+     }) {inherit (pkgs) openssl;};
+
   "sqlite" = callPackage
     ({ mkDerivation, base, bytestring, directory, pretty, sqlite, time
      , utf8-string
@@ -171684,6 +172909,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "srcloc_0_5_1_1" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "srcloc";
+       version = "0.5.1.1";
+       sha256 = "3148a6c6997b0cb92a0c698f4cb362deee6946ce61235c9dbd5cadf56ff61a17";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/mainland/srcloc";
+       description = "Data types for managing source code locations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "srec" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -172851,6 +174089,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "statistics_0_14_0_0" = callPackage
+    ({ mkDerivation, aeson, base, binary, deepseq, erf, HUnit, ieee754
+     , math-functions, monad-par, mwc-random, primitive, QuickCheck
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , vector, vector-algorithms, vector-binary-instances
+     , vector-th-unbox
+     }:
+     mkDerivation {
+       pname = "statistics";
+       version = "0.14.0.0";
+       sha256 = "d5857c2dfb4b860db567cc9444788f104c077caeac528deaf87a59309a65dfe2";
+       revision = "1";
+       editedCabalFile = "6432ecb4f7824f517b3ad2f8195b8554cb373621a26a72f4b511bdb5099a145c";
+       libraryHaskellDepends = [
+         aeson base binary deepseq erf math-functions monad-par mwc-random
+         primitive vector vector-algorithms vector-binary-instances
+         vector-th-unbox
+       ];
+       testHaskellDepends = [
+         aeson base binary erf HUnit ieee754 math-functions mwc-random
+         primitive QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 vector vector-algorithms
+       ];
+       homepage = "https://github.com/bos/statistics";
+       description = "A library of statistical types, data, and functions";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "statistics-dirichlet" = callPackage
     ({ mkDerivation, base, deepseq, hmatrix-special
      , nonlinear-optimization, vector
@@ -173877,6 +175144,59 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "store_0_4_3_1" = callPackage
+    ({ mkDerivation, array, async, base, base-orphans
+     , base64-bytestring, bytestring, cereal, 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
+     }:
+     mkDerivation {
+       pname = "store";
+       version = "0.4.3.1";
+       sha256 = "3781cbede555ac43365cd723ff4c4f6a06bf94659fcc811b5c21937b5b480b41";
+       libraryHaskellDepends = [
+         array async base base-orphans base64-bytestring bytestring conduit
+         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
+         th-reify-many th-utilities time transformers unordered-containers
+         vector void
+       ];
+       testHaskellDepends = [
+         array async base base-orphans base64-bytestring bytestring cereal
+         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
+       ];
+       benchmarkHaskellDepends = [
+         array async base base-orphans base64-bytestring bytestring 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 void
+       ];
+       homepage = "https://github.com/fpco/store#readme";
+       description = "Fast binary serialization";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "store-core_0_3" = callPackage
     ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text
      , transformers
@@ -173910,6 +175230,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "store-core_0_4_1" = callPackage
+    ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "store-core";
+       version = "0.4.1";
+       sha256 = "145285f9f26a64e9611e01749a0d569691a70fa898f5359bedcfca9dacb064b4";
+       libraryHaskellDepends = [
+         base bytestring fail ghc-prim primitive text transformers
+       ];
+       homepage = "https://github.com/fpco/store#readme";
+       description = "Fast and lightweight binary serialization";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "str" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, Crypto
      , hashable, MissingH, text, utf8-string
@@ -175607,6 +176944,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "superbubbles" = callPackage
+    ({ mkDerivation, base, containers, hspec, mtl }:
+     mkDerivation {
+       pname = "superbubbles";
+       version = "0.1.0";
+       sha256 = "a046e78292225a60e0b0774fcbefa763ff6895cc15c036aa9dc89529bf94a1d2";
+       revision = "3";
+       editedCabalFile = "5f7db1d87ff58b49df5b184650486e68aee1b29f9e481ccf6e2016b6f36b8084";
+       libraryHaskellDepends = [ base containers mtl ];
+       testHaskellDepends = [ base containers hspec ];
+       homepage = "https://github.com/bartavelle/superbubbles#readme";
+       description = "Find \"superbubbles\", as described in https://arxiv.org/abs/1307.7925";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "superbuffer" = callPackage
     ({ mkDerivation, async, base, buffer-builder, bytestring, criterion
      , HTF, QuickCheck
@@ -176058,8 +177410,8 @@ self: {
      }:
      mkDerivation {
        pname = "swish";
-       version = "0.9.1.7";
-       sha256 = "f816c8e7e6b264043ac7d6d8572e74aedbf3c455907fc6ab6d077d2f47893b80";
+       version = "0.9.1.8";
+       sha256 = "498f8e8b27b070a77a89652e1622b7dbee8ac5f1a9c8cc39dd93a41c566634ca";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -176808,8 +178160,8 @@ self: {
      }:
      mkDerivation {
        pname = "sys-process";
-       version = "0.1.6";
-       sha256 = "7838161f0acc22acdfcce3282e68be586c8833ec7c96e424471d07c3e6aac611";
+       version = "0.2.0";
+       sha256 = "098821af8b894b89b0013f8af12121674cf9671fd7d545fb2f851783522b54b6";
        libraryHaskellDepends = [
          base bifunctors directory filepath lens mtl notzero process
          semigroupoids semigroups transformers
@@ -176827,8 +178179,8 @@ self: {
     ({ mkDerivation, base, hspec, hspec-expectations }:
      mkDerivation {
        pname = "sysinfo";
-       version = "0.1.0.0";
-       sha256 = "5c703bbef63d63690ff7796fb1f9aa254c1b78039d28aa0ed80fef2c3ef7b650";
+       version = "0.1.1";
+       sha256 = "46db40f2d186956547cca98f5583b28828a2b50255fbd404272c381db64dca29";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec hspec-expectations ];
        homepage = "https://github.com/psibi/sysinfo#readme";
@@ -178285,6 +179637,8 @@ self: {
        pname = "tasty";
        version = "0.11.2";
        sha256 = "d26fbc4e5112af9ec3ca0a4a45d0f5edc5ae6675ffd72f922acb768062db675e";
+       revision = "1";
+       editedCabalFile = "ec66d3652e04b38f56f3f9c850258ef87d6fa31b4f909343105449c549325800";
        libraryHaskellDepends = [
          ansi-terminal async base clock containers deepseq mtl
          optparse-applicative regex-tdfa stm tagged unbounded-delays
@@ -178294,6 +179648,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty_0_11_2_1" = 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.1";
+       sha256 = "6956dfc8acf2ab20ff9bbe75f43e65a9ebd7abf5c11c5259d7134ad3d35ce2b9";
+       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
@@ -179639,6 +181012,192 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tensorflow" = callPackage
+    ({ mkDerivation, async, attoparsec, base, bytestring, c2hs
+     , containers, data-default, exceptions, fgl, HUnit, lens-family
+     , mainland-pretty, mtl, proto-lens, proto-lens-protoc, semigroups
+     , split, temporary, tensorflow, tensorflow-proto, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "tensorflow";
+       version = "0.1.0.1";
+       sha256 = "44f3e204bcd71212ff91089fc299340153c505fcf462f2dc325c38cd0dcea262";
+       libraryHaskellDepends = [
+         async attoparsec base bytestring containers data-default exceptions
+         fgl lens-family mainland-pretty mtl proto-lens proto-lens-protoc
+         semigroups split temporary tensorflow-proto text transformers
+         vector
+       ];
+       librarySystemDepends = [ tensorflow ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [
+         attoparsec base bytestring HUnit lens-family proto-lens
+         tensorflow-proto test-framework test-framework-hunit
+         test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/tensorflow/haskell#readme";
+       description = "TensorFlow bindings";
+       license = stdenv.lib.licenses.asl20;
+     }) {tensorflow = null;};
+
+  "tensorflow-core-ops" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, directory, filepath
+     , lens-family, mainland-pretty, proto-lens, tensorflow
+     , tensorflow-opgen, text
+     }:
+     mkDerivation {
+       pname = "tensorflow-core-ops";
+       version = "0.1.0.0";
+       sha256 = "2fb3ac8cf017d0859e511f1cbce67249c67aa5e5d1793a99f5771854e9a418d5";
+       setupHaskellDepends = [
+         base bytestring Cabal directory filepath mainland-pretty proto-lens
+         tensorflow tensorflow-opgen text
+       ];
+       libraryHaskellDepends = [
+         base bytestring lens-family proto-lens tensorflow text
+       ];
+       homepage = "https://github.com/tensorflow/haskell#readme";
+       description = "Haskell wrappers for Core Tensorflow Ops";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "tensorflow-logging" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, data-default, directory
+     , exceptions, filepath, hostname, HUnit, lens-family, proto-lens
+     , resourcet, stm, stm-chans, stm-conduit, temporary, tensorflow
+     , tensorflow-core-ops, tensorflow-ops, tensorflow-proto
+     , tensorflow-records-conduit, test-framework, test-framework-hunit
+     , text, time, transformers
+     }:
+     mkDerivation {
+       pname = "tensorflow-logging";
+       version = "0.1.0.0";
+       sha256 = "b78b9a403c574808d952f25ffc017435045c67de040273fde97b84c759972d69";
+       libraryHaskellDepends = [
+         base bytestring conduit data-default directory exceptions filepath
+         hostname lens-family proto-lens resourcet stm stm-chans stm-conduit
+         tensorflow tensorflow-core-ops tensorflow-ops tensorflow-proto
+         tensorflow-records-conduit text time transformers
+       ];
+       testHaskellDepends = [
+         base bytestring conduit data-default directory filepath HUnit
+         lens-family proto-lens resourcet temporary tensorflow-proto
+         tensorflow-records-conduit test-framework test-framework-hunit text
+       ];
+       homepage = "https://github.com/tensorflow/haskell#readme";
+       description = "TensorBoard related functionality";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "tensorflow-opgen" = callPackage
+    ({ mkDerivation, base, bytestring, containers, filepath
+     , lens-family, mainland-pretty, optparse-applicative, proto-lens
+     , semigroups, tensorflow-proto, text
+     }:
+     mkDerivation {
+       pname = "tensorflow-opgen";
+       version = "0.1.0.0";
+       sha256 = "47ae7f0ef8e28cdf1f09aad79c28ab421e80310339d4372b848a3204a8b7a49a";
+       libraryHaskellDepends = [
+         base bytestring containers filepath lens-family mainland-pretty
+         optparse-applicative proto-lens semigroups tensorflow-proto text
+       ];
+       homepage = "https://github.com/tensorflow/haskell#readme";
+       description = "Code generation for TensorFlow operations";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "tensorflow-ops" = callPackage
+    ({ mkDerivation, base, bytestring, containers, criterion
+     , data-default, deepseq, fgl, HUnit, lens-family, mtl, proto-lens
+     , QuickCheck, random, temporary, tensorflow, tensorflow-core-ops
+     , tensorflow-proto, tensorflow-test, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "tensorflow-ops";
+       version = "0.1.0.0";
+       sha256 = "f49904c4c70a3525dee3a43431dcea32d059c80bbabda31d8e10f77cd6fba91a";
+       libraryHaskellDepends = [
+         base bytestring containers data-default fgl lens-family mtl
+         proto-lens tensorflow tensorflow-core-ops tensorflow-proto text
+       ];
+       testHaskellDepends = [
+         base bytestring data-default HUnit lens-family proto-lens
+         QuickCheck random temporary tensorflow tensorflow-core-ops
+         tensorflow-proto tensorflow-test test-framework
+         test-framework-hunit test-framework-quickcheck2 transformers vector
+       ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq tensorflow transformers vector
+       ];
+       homepage = "https://github.com/tensorflow/haskell#readme";
+       description = "Friendly layer around TensorFlow bindings";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "tensorflow-proto" = callPackage
+    ({ mkDerivation, base, Cabal, proto-lens, proto-lens-protoc }:
+     mkDerivation {
+       pname = "tensorflow-proto";
+       version = "0.1.0.0";
+       sha256 = "b696782fb0383c5aafd595afe04b52590b266f97af601cd6b217397d773b681a";
+       setupHaskellDepends = [ base Cabal proto-lens-protoc ];
+       libraryHaskellDepends = [ base proto-lens proto-lens-protoc ];
+       homepage = "https://github.com/tensorflow/haskell#readme";
+       description = "TensorFlow protocol buffers";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "tensorflow-records" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, snappy-framing
+     , test-framework, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "tensorflow-records";
+       version = "0.1.0.0";
+       sha256 = "f234d3f722c6f50c14dcb31e654a37765ec87ed82cd2344b8c78a0a77c919027";
+       libraryHaskellDepends = [ base bytestring cereal snappy-framing ];
+       testHaskellDepends = [
+         base bytestring cereal test-framework test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/tensorflow/haskell#readme";
+       description = "Encoder and decoder for the TensorFlow \"TFRecords\" format";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "tensorflow-records-conduit" = callPackage
+    ({ mkDerivation, base, bytestring, cereal-conduit, conduit
+     , conduit-extra, exceptions, resourcet, tensorflow-records
+     }:
+     mkDerivation {
+       pname = "tensorflow-records-conduit";
+       version = "0.1.0.0";
+       sha256 = "6c034801dd6450c8436fa8ec59031633c5739620553f7a960695a45e96278dca";
+       libraryHaskellDepends = [
+         base bytestring cereal-conduit conduit conduit-extra exceptions
+         resourcet tensorflow-records
+       ];
+       homepage = "https://github.com/tensorflow/haskell#readme";
+       description = "Conduit wrappers for TensorFlow.Records.";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "tensorflow-test" = callPackage
+    ({ mkDerivation, base, HUnit, vector }:
+     mkDerivation {
+       pname = "tensorflow-test";
+       version = "0.1.0.0";
+       sha256 = "378217dde895daf6599a8d3fb07ed59de5e2d8024958277558faca190bb44afc";
+       libraryHaskellDepends = [ base HUnit vector ];
+       homepage = "https://github.com/tensorflow/haskell#readme";
+       description = "Some common functions for test suites";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "term-rewriting" = callPackage
     ({ mkDerivation, ansi-wl-pprint, array, base, containers, HUnit
      , mtl, multiset, parsec, QuickCheck, union-find-array
@@ -182189,6 +183748,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "threepenny-editors" = callPackage
+    ({ mkDerivation, base, profunctors, threepenny-gui }:
+     mkDerivation {
+       pname = "threepenny-editors";
+       version = "0.2.0.2";
+       sha256 = "cbcfa4cea3f4f72c95fc334b02bda6e3c5657d0b8378b0e307feeb7f9237c95a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base profunctors threepenny-gui ];
+       homepage = "https://github.com/pepeiborra/threepenny-editors";
+       description = "Composable algebraic editors";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "threepenny-gui" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , data-default, deepseq, filepath, hashable, network-uri, safe
@@ -182553,19 +184126,20 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "tidal_0_9_2" = callPackage
-    ({ mkDerivation, applicative-numbers, base, colour, containers
-     , hashable, hosc, mersenne-random-pure64, mtl, parsec, safe, text
-     , time, websockets
+  "tidal_0_9_4" = callPackage
+    ({ mkDerivation, base, colour, containers, hashable, hosc
+     , mersenne-random-pure64, mtl, parsec, safe, tasty, tasty-hunit
+     , text, time, websockets
      }:
      mkDerivation {
        pname = "tidal";
-       version = "0.9.2";
-       sha256 = "518187f765f2ccb70b83a65f833e4a6fa1a02be36519f27c53a738ef8c9bdc40";
+       version = "0.9.4";
+       sha256 = "f68e0da8e7eab9693a7cb33b6cd838999f1f81d902b31bb882a76e1b490649c4";
        libraryHaskellDepends = [
-         applicative-numbers base colour containers hashable hosc
-         mersenne-random-pure64 mtl parsec safe text time websockets
+         base colour containers hashable hosc mersenne-random-pure64 mtl
+         parsec safe text time websockets
        ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
        homepage = "http://tidalcycles.org/";
        description = "Pattern language for improvised music";
        license = stdenv.lib.licenses.gpl3;
@@ -182578,8 +184152,8 @@ self: {
      }:
      mkDerivation {
        pname = "tidal-midi";
-       version = "0.9.2";
-       sha256 = "ac9555387d046e382532d8816d57b2e4999b9713fb88e0cfbfe00f8252a8de60";
+       version = "0.9.4";
+       sha256 = "1b06296b35a860ae38c4d0983647cc2818519ca0bcd4658878e5d4593338d726";
        libraryHaskellDepends = [
          base containers PortMidi tidal time transformers
        ];
@@ -182608,8 +184182,8 @@ self: {
     ({ mkDerivation, base, cairo, colour, tidal }:
      mkDerivation {
        pname = "tidal-vis";
-       version = "0.9.2";
-       sha256 = "890bbe98ebde65b1c23064d7b192294e7596112c1db59de7a5909233f409aaef";
+       version = "0.9.3";
+       sha256 = "b771cdc39adae7f78c6bd036d023bcec07dec00999aa8914c0d9ddef3f3b41ea";
        libraryHaskellDepends = [ base cairo colour tidal ];
        homepage = "http://yaxu.org/tidal/";
        description = "Visual rendering for Tidal patterns";
@@ -183834,6 +185408,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tmapchan" = callPackage
+    ({ mkDerivation, base, containers, hashable, stm
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "tmapchan";
+       version = "0.0.1";
+       sha256 = "c9c5c7547d8cd430c118a64b794fdb0726284e5ac8b135f87dbf89e1ca514f03";
+       libraryHaskellDepends = [
+         base containers hashable stm unordered-containers
+       ];
+       homepage = "https://github.com/athanclark/tmapchan#readme";
+       description = "A time-ordered multimap which consumes values as you lookup";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tmpl" = callPackage
     ({ mkDerivation, base, bytestring, directory, template, text }:
      mkDerivation {
@@ -184139,6 +185729,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "toml-parser" = callPackage
+    ({ mkDerivation, alex, array, base, happy, text, time }:
+     mkDerivation {
+       pname = "toml-parser";
+       version = "0.1.0.0";
+       sha256 = "da81ecf51a9f814aef58d24f3ab95e46a57076a8eb3d2989c58ce204c0a0365c";
+       libraryHaskellDepends = [ array base text time ];
+       libraryToolDepends = [ alex happy ];
+       homepage = "https://github.com/glguy/toml-parser";
+       description = "Parser for the TOML configuration language";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "toolshed" = callPackage
     ({ mkDerivation, array, base, containers, data-default, deepseq
      , directory, filepath, HUnit, QuickCheck, random
@@ -184825,12 +186428,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "transformers-lift_0_2_0_0" = callPackage
+  "transformers-lift_0_2_0_1" = callPackage
     ({ mkDerivation, base, transformers, writer-cps-transformers }:
      mkDerivation {
        pname = "transformers-lift";
-       version = "0.2.0.0";
-       sha256 = "11d477a62184c19c49fc923bef6f7ef32ca1d69f78dbdbf3c896fbebcdaaaf63";
+       version = "0.2.0.1";
+       sha256 = "0bd8bf23fb29874daf9ff990bf25035e21208cfa292f9f18e8cfdb0b4b1ee09d";
        libraryHaskellDepends = [
          base transformers writer-cps-transformers
        ];
@@ -185366,8 +186969,8 @@ self: {
      }:
      mkDerivation {
        pname = "triplesec";
-       version = "0.1.1.1";
-       sha256 = "bb5867e87c841a8b307dbd1bfa71968dbe9a189b5ff4327307fc3a3fd68fadcc";
+       version = "0.1.2.0";
+       sha256 = "86b8749e708fd288a874d23ebeb9ff5e3a584ada13bc22c3a9b596418bd57063";
        libraryHaskellDepends = [
          base cryptonite memory mtl transformers
        ];
@@ -186082,8 +187685,8 @@ self: {
      }:
      mkDerivation {
        pname = "tweet-hs";
-       version = "0.5.3.10";
-       sha256 = "8f9737059adc55895d689e061287d184ab33131308130a8303708fce341fbc63";
+       version = "0.5.3.11";
+       sha256 = "469c03bc6b8c7396c6c9d461d429ffafb15725e417819b5113b54124c760c893";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -188046,8 +189649,8 @@ self: {
     ({ mkDerivation, base, io-streams, unagi-chan }:
      mkDerivation {
        pname = "unagi-streams";
-       version = "0.2.0";
-       sha256 = "2a9fe32a18f9ab2211e03916956b34f341fa417e879dfd18a01f7eb907133c56";
+       version = "0.2.2";
+       sha256 = "8a94c07be7c005eee201e76d92e112d105fa3ca0f6978e3bbf8ac3460f0068ec";
        libraryHaskellDepends = [ base io-streams unagi-chan ];
        homepage = "https://github.com/LukeHoersten/unagi-streams";
        description = "Unagi Chan IO-Streams";
@@ -188141,6 +189744,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unbounded-delays_0_1_1_0" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "unbounded-delays";
+       version = "0.1.1.0";
+       sha256 = "8aa7f7d10a8d0073518804db76c3ef4c313359994ef175122341b0bce07329c7";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/basvandijk/unbounded-delays";
+       description = "Unbounded thread delays and timeouts";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unbounded-delays-units" = callPackage
     ({ mkDerivation, base, unbounded-delays, units, units-defs }:
      mkDerivation {
@@ -188167,6 +189783,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "unboxed-ref" = callPackage
+    ({ mkDerivation, base, ghc-prim, primitive }:
+     mkDerivation {
+       pname = "unboxed-ref";
+       version = "0.3.0.0";
+       sha256 = "f42553dafe4b24aa16ef88cb71fdf665c9eede522148473f05db2bea7c4dfc7f";
+       libraryHaskellDepends = [ base ghc-prim primitive ];
+       homepage = "https://github.com/winterland1989/unboxed-ref";
+       description = "Fast unboxed references for ST and IO monad";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "unbreak" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
      , bytestring, cereal, cmdargs, cryptonite, memory, process, text
@@ -191845,6 +193473,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "verify" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, containers, either
+     , hspec, jwt, QuickCheck, text, text-conversions, time
+     }:
+     mkDerivation {
+       pname = "verify";
+       version = "0.0.0";
+       sha256 = "ee7755061154b794fbf8ab60995bb3741313ef1137526e091a8ab357b33327e2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base64-bytestring containers either jwt text
+         text-conversions time
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base hspec jwt QuickCheck text text-conversions time
+       ];
+       description = "A new Haskeleton package";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "verilog" = callPackage
     ({ mkDerivation, alex, array, base, happy }:
      mkDerivation {
@@ -194079,12 +195729,9 @@ self: {
     ({ mkDerivation, aeson, base, http-client, http-types, wai }:
      mkDerivation {
        pname = "wai-slack-middleware";
-       version = "0.1.0.0";
-       sha256 = "76e46b6de6feecabaad0929a7e5926ac97884749192de1c9befabf0afee646fb";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.2.0";
+       sha256 = "d14482f43147e16f05c7282f5b478e76a803dc7398d73dbf6cd2d9be83695750";
        libraryHaskellDepends = [ aeson base http-client http-types wai ];
-       executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/psibi/wai-slack-middleware#readme";
        description = "A Slack middleware for WAI";
@@ -194376,6 +196023,43 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "warp_3_2_12" = callPackage
+    ({ mkDerivation, array, async, auto-update, base, blaze-builder
+     , bytestring, bytestring-builder, case-insensitive, containers
+     , criterion, directory, doctest, ghc-prim, hashable, hspec, HTTP
+     , http-date, http-types, http2, HUnit, iproute, lifted-base
+     , network, process, QuickCheck, silently, simple-sendfile, stm
+     , streaming-commons, text, time, transformers, unix, unix-compat
+     , vault, wai, word8
+     }:
+     mkDerivation {
+       pname = "warp";
+       version = "3.2.12";
+       sha256 = "e33ce7e223e9438073bb02d91a5d86c2f9689e75ce172b0311124851a083a711";
+       libraryHaskellDepends = [
+         array async auto-update base blaze-builder bytestring
+         bytestring-builder case-insensitive containers ghc-prim hashable
+         http-date http-types http2 iproute network simple-sendfile stm
+         streaming-commons text unix unix-compat vault wai word8
+       ];
+       testHaskellDepends = [
+         array async auto-update base blaze-builder bytestring
+         bytestring-builder case-insensitive containers directory doctest
+         ghc-prim hashable hspec HTTP http-date http-types http2 HUnit
+         iproute lifted-base network process QuickCheck silently
+         simple-sendfile stm streaming-commons text time transformers unix
+         unix-compat vault wai word8
+       ];
+       benchmarkHaskellDepends = [
+         auto-update base bytestring containers criterion hashable http-date
+         http-types network unix unix-compat
+       ];
+       homepage = "http://github.com/yesodweb/wai";
+       description = "A fast, light-weight web server for WAI applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "warp-dynamic" = callPackage
     ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }:
      mkDerivation {
@@ -195529,22 +197213,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "websockets-rpc_0_1_0" = callPackage
+  "websockets-rpc_0_6_0" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
-     , exceptions, mtl, QuickCheck, quickcheck-instances, stm, tasty
-     , tasty-quickcheck, text, transformers, unordered-containers
-     , wai-transformers, websockets
+     , exceptions, hashable, monad-control, mtl, QuickCheck
+     , quickcheck-instances, stm, tasty, tasty-quickcheck, text
+     , transformers, unordered-containers, uuid, wai-transformers
+     , websockets, websockets-simple
      }:
      mkDerivation {
        pname = "websockets-rpc";
-       version = "0.1.0";
-       sha256 = "010cf07ebf06a5a9caf406dbd88e1697efbbe6f4dd43d0bdc707ac341db4ec4c";
+       version = "0.6.0";
+       sha256 = "efcd5b6d39506fc591863d10d2e179603a004f7730bc1424920c69d7412b31ce";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson async base bytestring containers exceptions mtl QuickCheck
-         stm text transformers unordered-containers wai-transformers
-         websockets
+         aeson async base bytestring containers exceptions hashable
+         monad-control mtl QuickCheck stm text transformers
+         unordered-containers uuid wai-transformers websockets
+         websockets-simple
        ];
        testHaskellDepends = [
          aeson base QuickCheck quickcheck-instances tasty tasty-quickcheck
@@ -195554,6 +197240,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "websockets-simple" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, every, exceptions
+     , monad-control, stm, wai-transformers, websockets
+     }:
+     mkDerivation {
+       pname = "websockets-simple";
+       version = "0.0.5";
+       sha256 = "5cfcbd9d6d5fe4f6420d8e677dcd3761da53254f6267f6d480fc85ab87191a97";
+       libraryHaskellDepends = [
+         aeson async base bytestring every exceptions monad-control stm
+         wai-transformers websockets
+       ];
+       homepage = "https://github.com/athanclark/websockets-simple#readme";
+       description = "Simpler interface to the websockets api";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "websockets-snap" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-builder, io-streams
      , mtl, snap-core, snap-server, websockets
@@ -195631,8 +197334,8 @@ self: {
      }:
      mkDerivation {
        pname = "weeder";
-       version = "0.1.2";
-       sha256 = "8892b9d8cb683ec19b53701480ab8485a4b1f5a1f96ec2a6cec05a7722f81132";
+       version = "0.1.3";
+       sha256 = "b21986454d348b830b5f438ea82ac2f656cb99fcb9dd1739087aa56595577897";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -196539,8 +198242,8 @@ self: {
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.3.13";
-       sha256 = "e96203096f770c4241d1ac2e0b8163b6af551c32eb57950a5223f9f1c2327283";
+       version = "0.3.14";
+       sha256 = "623814f3bd9dea11daa3c165578f6edcaadbab33566e23127a8acb94369873b5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -196763,8 +198466,8 @@ self: {
      }:
      mkDerivation {
        pname = "workflow-extra";
-       version = "0.0.0";
-       sha256 = "133345c360906957be3a9aedb2c9fef008af0072de12a9436a34fec22f323f9e";
+       version = "0.0.1";
+       sha256 = "d5ac0573392e0ee4a125b36a98fed44d2744835934585024bc5cfee4bb51b16f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -196775,7 +198478,7 @@ self: {
        testHaskellDepends = [ base doctest hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        homepage = "http://github.com/sboosali/workflow-extra#readme";
-       description = "TODO";
+       description = "Utilities (e.g. Googling the clipboard contents) for the `workflow` pacakge";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -196800,19 +198503,41 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "workflow-types" = callPackage
-    ({ mkDerivation, base, comonad, containers, deepseq, Earley
-     , exceptions, free, hashable, semigroups, split, transformers
+  "workflow-pure" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, doctest, exceptions
+     , free, hspec, mtl, QuickCheck, semigroups, transformers
+     , workflow-types
      }:
      mkDerivation {
-       pname = "workflow-types";
-       version = "0.0.0";
-       sha256 = "54991eaf641bdf43e0d3e99bee650fa6ae2690adeb34d0f6378b5a0d93aaafa7";
+       pname = "workflow-pure";
+       version = "0.0.1";
+       sha256 = "9f6749231edd241d17d933e4d2a2a84b273f1f6ce618f9e6f83e86321382f2d4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base comonad containers deepseq Earley exceptions free hashable
-         semigroups split transformers
+         base deepseq exceptions free mtl semigroups transformers
+         workflow-types
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest hspec QuickCheck ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
+       homepage = "http://github.com/sboosali/workflow-pure#readme";
+       description = "manipulate `workflow-types:Workflow`'s";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "workflow-types" = callPackage
+    ({ mkDerivation, base, containers, exceptions, free, spiros, split
+     , text, transformers
+     }:
+     mkDerivation {
+       pname = "workflow-types";
+       version = "0.0.1";
+       sha256 = "c20e58f943f6e606def792a90dedba8bf590c001ef4ed6e2705507ee3b5e8c20";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers exceptions free spiros split text transformers
        ];
        executableHaskellDepends = [ base ];
        homepage = "http://github.com/sboosali/workflow-types#readme";
@@ -197882,6 +199607,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "xeno_0_2" = callPackage
+    ({ mkDerivation, array, base, bytestring, criterion, deepseq
+     , ghc-prim, hexml, hexpat, hspec, mtl, mutable-containers, vector
+     , weigh, xml
+     }:
+     mkDerivation {
+       pname = "xeno";
+       version = "0.2";
+       sha256 = "af56361848089becb1db47e236014568aebc5cb053fe6e1637523eedc307cd26";
+       libraryHaskellDepends = [
+         array base bytestring deepseq mtl mutable-containers vector
+       ];
+       testHaskellDepends = [ base bytestring hexml hspec ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq ghc-prim hexml hexpat weigh xml
+       ];
+       homepage = "https://github.com/ocramz/xeno";
+       description = "A fast event-based XML parser in pure Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xenstore" = callPackage
     ({ mkDerivation, base, bytestring, cereal, mtl, network }:
      mkDerivation {
@@ -198932,8 +200679,8 @@ self: {
        pname = "xmlhtml";
        version = "0.2.3.5";
        sha256 = "e333a1c7afd5068b60b143457fea7325a34408cc65b3ac55f5b342eb0274b06d";
-       revision = "3";
-       editedCabalFile = "4b5e2c334e6fdcab94095ca5fa805a2353690d3a616733cec0febf2ba2991880";
+       revision = "4";
+       editedCabalFile = "e2c3c5234105ee96cb3292edf8769290b5689767fcd32517404b7e562b4a6a1c";
        libraryHaskellDepends = [
          base blaze-builder blaze-html blaze-markup bytestring containers
          parsec text unordered-containers
@@ -199011,8 +200758,8 @@ self: {
      }:
      mkDerivation {
        pname = "xmobar";
-       version = "0.24.3";
-       sha256 = "d330079dd60e22004a4cfa271eb9e00a1bb36b8dafcbbf1b1a5980d401dcf510";
+       version = "0.24.4";
+       sha256 = "054e21bc4b5b55c096342b6b5071f66443b663a325068a2733bb69d5d362b5c8";
        configureFlags = [ "-fall_extensions" ];
        isLibrary = false;
        isExecutable = true;
@@ -201079,6 +202826,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) sqlite;};
 
+  "yesod-fast-devel" = callPackage
+    ({ mkDerivation, ansi-terminal, base, bytestring, directory
+     , filepath, fsnotify, Glob, optparse-applicative, process, pureMD5
+     , stm, system-filepath, temporary, text
+     }:
+     mkDerivation {
+       pname = "yesod-fast-devel";
+       version = "0.1.2.0";
+       sha256 = "49ec1ffbcf03f8d61595a218bd1c7835f67f1feccc07cbe03b91bf6a68f1a6fc";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         ansi-terminal base bytestring directory filepath fsnotify Glob
+         optparse-applicative process pureMD5 stm system-filepath temporary
+         text
+       ];
+       homepage = "https://github.com/haskellbr/yesod-fast-devel#readme";
+       description = "Fast live-reloading for yesod applications";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "yesod-fay" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, directory
      , fay, fay-dom, filepath, monad-loops, process, pureMD5
@@ -201250,8 +203018,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-job-queue";
-       version = "0.3.0.1";
-       sha256 = "a58805e218e5b0e6c623a5447f06484004d72a357f4b2e30d476da56618b734f";
+       version = "0.3.0.3";
+       sha256 = "a05d00b43d6eadbb0326850487a37a2a260607620a626a735d1e6854dafcb3d7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -203217,10 +204985,8 @@ self: {
      }:
      mkDerivation {
        pname = "zifter";
-       version = "0.0.1.1";
-       sha256 = "ea8c1a721789144ae7207474a91f0471d17c42aa5a8e6962eca93c41b189de45";
-       revision = "1";
-       editedCabalFile = "38d76a58f2a44cbef3d535592d54e082011fb7ee539c1a659d4a58d5bbc961a1";
+       version = "0.0.1.2";
+       sha256 = "1e5b9db56c5d97af5ae540059377b1da924f9fb9724c644991987d2dd9f72c7b";
        libraryHaskellDepends = [
          ansi-terminal async base directory exceptions filepath
          optparse-applicative path path-io process safe stm validity
@@ -203242,8 +205008,8 @@ self: {
      }:
      mkDerivation {
        pname = "zifter-cabal";
-       version = "0.0.0.0";
-       sha256 = "3ea3b662b68174f44d7e7eb2b5032d928743ecad3e7fa3a466194159c47929e4";
+       version = "0.0.0.1";
+       sha256 = "6d30f26a383b8c3d34f4efcd3b486a954925aebb0d522a0dd8fd8b99ef124831";
        libraryHaskellDepends = [
          base directory filepath path path-io process zifter
        ];
@@ -203266,14 +205032,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "zifter-google-java-format" = callPackage
+    ({ mkDerivation, base, filepath, path, path-io, process, safe
+     , zifter
+     }:
+     mkDerivation {
+       pname = "zifter-google-java-format";
+       version = "0.0.0.0";
+       sha256 = "869473829280f46f0b3de45788e32ffaf9fc99b56074d45c4cf42f48deab834e";
+       libraryHaskellDepends = [
+         base filepath path path-io process safe zifter
+       ];
+       homepage = "http://cs-syd.eu";
+       description = "zifter-google-java-format";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "zifter-hindent" = callPackage
     ({ mkDerivation, base, directory, filepath, path, path-io, process
      , safe, zifter
      }:
      mkDerivation {
        pname = "zifter-hindent";
-       version = "0.0.0.0";
-       sha256 = "39ade41a13e0aa8b675a15cfeb34605eb4caa78f035fdd2470681c4814b16d06";
+       version = "0.0.0.1";
+       sha256 = "4fc534385b8b3ec91761fac85ef62b5492abd253c940dac128b8e01ff8a61c83";
        libraryHaskellDepends = [
          base directory filepath path path-io process safe zifter
        ];
@@ -203367,6 +205149,8 @@ self: {
        pname = "zip";
        version = "0.1.10";
        sha256 = "8ec11736f49ffc9b07fa51910d7e06791358e02ba4073e5ad6346b7d3172530d";
+       revision = "1";
+       editedCabalFile = "5757bd13370617bf0ab4ecab55d4b7afb399a68aa7a09675a4c5332bd1abc492";
        libraryHaskellDepends = [
          base bytestring bzlib-conduit case-insensitive cereal conduit
          conduit-extra containers digest exceptions filepath mtl path

From 890fd54fdeb90fa3fc4ef37f84de023c058e6a13 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 9 May 2017 10:56:22 +0200
Subject: [PATCH 81/84] haskell-loc-test: break infinite recursion in test
 dependencies

---
 pkgs/development/haskell-modules/configuration-nix.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index e2dc2dbe35e..15dca1c0bc5 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -454,4 +454,8 @@ self: super: builtins.intersectAttrs super {
       export PATH="$PWD/dist/build/intero:$PATH"
     '';
   });
+
+  # loc and loc-test depend on each other for testing. Break that infinite cycle:
+  loc-test = super.loc-test.override { loc = dontCheck self.loc; };
+
 }

From 165a6548adfaa4be9d1a9f9cdf53cf4730a1d25d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 12 May 2017 10:00:49 +0200
Subject: [PATCH 82/84] nvidia_x11_legacy340: fix patch URL to fix #25721

Using fixed-commit URLs and fetchpatch is just more robust.
---
 pkgs/os-specific/linux/nvidia-x11/generic.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index 8e3f589c377..a21e6ecfc31 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -8,7 +8,7 @@
 , preferGtk2 ? false
 }:
 
-{ stdenv, callPackage, callPackage_i686, fetchurl
+{ stdenv, callPackage, callPackage_i686, fetchurl, fetchpatch
 , kernel ? null, xorg, zlib, perl, nukeReferences
 , # Whether to build the libraries only (i.e. not the kernel module or
   # nvidia-settings).  Used to support 32-bit binaries on 64-bit
@@ -49,9 +49,10 @@ let
               then null
               else if versionOlder version "375"
               then [
-                     (fetchurl {
-                         url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/4.10.0_kernel.patch?h=packages/nvidia-340xx;
-                         sha256 = "08k2phr9kawg6a3v88d4zkj7gdlih29gm5a1gmhpgmvd926k0z5l";
+                     (fetchpatch {
+                        name = "kernel-4.10.patch";
+                        url = https://git.archlinux.org/svntogit/packages.git/plain/nvidia-340xx/trunk/4.10.0_kernel.patch?id=53fb1df89;
+                        sha256 = "171hb57m968qdjcr3h8ppfzhrchf573f39rdja86a1qq1gmrv7pa";
                      })
                          # from https://git.archlinux.org/svntogit/packages.git/plain/trunk/fs52243.patch?h=packages/nvidia-340xx
                          # with datestamps removed

From 4f51a1ef3295d6a71382597bd6a486643d76f95f Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Fri, 12 May 2017 01:29:17 -0700
Subject: [PATCH 83/84] nvidia-x11: add dbus as a dependency to settings

for the latest beta release, the nvidia-settings binary will not compile
without dbus/dbus.h
---
 pkgs/os-specific/linux/nvidia-x11/settings.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix
index aed0cfab436..9c8f3f9cd74 100644
--- a/pkgs/os-specific/linux/nvidia-x11/settings.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix
@@ -1,6 +1,6 @@
 nvidia_x11: sha256:
 
-{ stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, gtk3, libXv, libXrandr, libvdpau
+{ stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libvdpau
 , librsvg, wrapGAppsHook
 , withGtk2 ? false, withGtk3 ? true
 }:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig m4 ];
 
-  buildInputs = [ jansson libXv libXrandr libvdpau nvidia_x11 gtk2 ]
+  buildInputs = [ jansson libXv libXrandr libvdpau nvidia_x11 gtk2 dbus ]
              ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ];
 
   NIX_LDFLAGS = [ "-lvdpau" "-lXrandr" "-lXv" "-lnvidia-ml" ];

From e25665591b66038c668418c58eaf2810d8f1c90e Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 12 May 2017 16:45:27 +0800
Subject: [PATCH 84/84] qsyncthingtray: build with qt 5.6

---
 pkgs/applications/misc/qsyncthingtray/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix
index c314a226b26..d6aea74d997 100644
--- a/pkgs/applications/misc/qsyncthingtray/default.nix
+++ b/pkgs/applications/misc/qsyncthingtray/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl3;
     maintainers = with maintainers; [ zraexy peterhoeg ];
     platforms = platforms.all;
-    # 0.5.7 segfaults when opening the main panel with qt 5.7 but qt 5.8 is OK
-    broken = builtins.compareVersions qtbase.version "5.7.0" == 0;
+    # 0.5.7 segfaults when opening the main panel with qt 5.7 and fails to compile with qt 5.8
+    broken = builtins.compareVersions qtbase.version "5.7.0" >= 0;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 696b65ef690..8609b162558 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15391,8 +15391,8 @@ with pkgs;
     qt = qt4;
   };
 
-  # 0.5.7 segfaults when opening the main panel with qt 5.7 but qt 5.8 is OK
-  qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { };
+  # 0.5.7 segfaults when opening the main panel with qt 5.7 and fails to compile with qt 5.8
+  qsyncthingtray = libsForQt56.callPackage ../applications/misc/qsyncthingtray { };
 
   qsynth = callPackage ../applications/audio/qsynth { };